| b5cc62f | Junio C Hamano | 01 May 2007, 00:09:48 UTC | GIT v1.5.1.3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 May 2007, 00:09:48 UTC |
| 928a559 | Jari Aalto | 30 April 2007, 12:37:28 UTC | send-email documentation: clarify --smtp-server It can be either hostname/address, or a full path to a local executable. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:50:55 UTC |
| 34b604a | Jari Aalto | 30 April 2007, 11:21:38 UTC | git.7: Mention preformatted html doc location Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:43:12 UTC |
| a7af09d | Jari Aalto | 30 April 2007, 16:04:25 UTC | Clarify SubmittingPatches Checklist Separate things to be checked when making commits, and things to be checked when sending patches. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:39:18 UTC |
| b3cb7e4 | Adam Roben | 29 April 2007, 08:35:27 UTC | git-svn: Add 'find-rev' command This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 22:58:37 UTC |
| bcd8ee5 | Junio C Hamano | 29 April 2007, 21:05:54 UTC | Fix symlink handling in git-svn, related to PerlIO After reading the leading contents from a symlink data obtained from subversion, which we expect to begin with 'link ', the code forked to hash the remainder (which should match readlink() result) using git-hash-objects, by redirecting its STDIN from the filehandle we read that 'link ' from. This was Ok with Perl on modern Linux, but on Mac OS, the read in the parent process slurped more than we asked for in stdio buffer, and the child did not correctly see the "remainder". This attempts to fix the issue by using lower level sysseek and sysread instead of seek and read to bypass the stdio buffer. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Seth Falcon <sethfalcon@gmail.com> | 30 April 2007, 22:50:13 UTC |
| e9d54bd | Julian Phillips | 29 April 2007, 02:46:42 UTC | http.c: Fix problem with repeated calls of http_init Calling http_init after calling http_cleanup causes a segfault. This is due to the pragma_header curl_slist being freed but not being set to NULL. The subsequent call to http_init tries to setup the slist again, but it now points to an invalid memory location. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 4e58bf9 | Josh Triplett | 29 April 2007, 01:40:12 UTC | Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| d0c32b6 | Junio C Hamano | 29 April 2007, 07:31:14 UTC | Fix import-tars fix. This heeds advice from our resident Perl expert to make sure the script is not confused with a string that ends with /\n Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 2342c4e | Junio C Hamano | 29 April 2007, 07:22:00 UTC | Update .mailmap with "Michael" Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 4e6380e | Junio C Hamano | 28 April 2007, 07:15:48 UTC | Do not barf on too long action description Reflog message is primarily about easier identification, and leaving truncated entry is much better than dying. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:33:13 UTC |
| 5b5fe9a | Junio C Hamano | 29 April 2007, 01:15:00 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes | 29 April 2007, 01:15:00 UTC |
| cb2cada | Shawn O. Pearce | 29 April 2007, 00:29:23 UTC | Catch empty pathnames in trees during fsck Released versions of fast-import have been able to create a tree that contains files or subtrees that contain no name. Unfortunately these trees aren't valid, but people may have actually tried to create them due to bugs in import-tars.perl or their own fast-import frontend. We now look for this unusual condition and warn the user if at least one of their tree objects contains the problem. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 01:06:00 UTC |
| ec771a7 | Shawn O. Pearce | 29 April 2007, 00:05:20 UTC | Merge commit 'jc/maint' into gfi-maint * commit 'jc/maint': (35 commits) Update git-http-fetch documentation Update git-local-fetch documentation Update git-http-push documentation Update -L documentation for git-blame/git-annotate Update git-grep documentation Update git-fmt-merge documentation Document additional options for git-fetch Removing -n option from git-diff-files documentation Start preparing for 1.5.1.3 Sanitize @to recipients. git-svn: Ignore usernames in URLs in find_by_url Document --dry-run and envelope-sender for git-send-email. Allow users to optionally specify their envelope sender. Ensure clean addresses are always used with Net::SMTP Validate @recipients before using it for sendmail and Net::SMTP. Perform correct quoting of recipient names. Change the scope of the $cc variable as it is not needed outside of send_message. Debugging cleanup improvements Prefix Dry- to the message status to denote dry-runs. Document --dry-run parameter to send-email. ... | 29 April 2007, 00:05:20 UTC |
| 475d1b3 | Shawn O. Pearce | 29 April 2007, 00:01:27 UTC | Don't allow empty pathnames in fast-import riddochc on #git noticed corruption caused by import-tars. This was fixed in the prior commit by Dscho, but fast-import was wrong to have allowed a tree to be created with an empty string as the filename. No operating system allows this, and Git itself doesn't accept this into the index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2007, 00:03:25 UTC |
| 87859f3 | Johannes Schindelin | 28 April 2007, 23:59:47 UTC | import-tars: be nice to wrong directory modes Some tars seem to have modes 0755 for directories, not 01000755. Do not generate an empty object for them, but ignore them. Noticed by riddochc on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2007, 00:01:36 UTC |
| 26e6016 | Adam Roben | 27 April 2007, 18:57:53 UTC | git-svn: Added 'find-rev' command This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 April 2007, 06:18:15 UTC |
| bb924cb | Michele Ballabio | 27 April 2007, 19:56:47 UTC | git shortlog documentation: add long options and fix a typo Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 April 2007, 06:17:58 UTC |
| 71e2e59 | Andrew Ruder | 27 April 2007, 04:59:02 UTC | Update git-http-fetch documentation Documentation/git-http-fetch.txt: --recover to resume a failed fetch operation. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:11 UTC |
| f5158a0 | Andrew Ruder | 27 April 2007, 04:59:01 UTC | Update git-local-fetch documentation Documentation/git-local-fetch.txt: -s to use symbolic links instead of file-to-file copy, -l to use hardlinks, -n to never use file-to-file copies, --recover to resume a failed fetch. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| d8190a8 | Andrew Ruder | 27 April 2007, 04:59:00 UTC | Update git-http-push documentation Documentation/git-http-push.txt: Changing --complete to --all. Added documentation for -d and -D to remote remote refs. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| a44f88e | Andrew Ruder | 27 April 2007, 04:58:59 UTC | Update -L documentation for git-blame/git-annotate Documenting alternate ways to use -L: -L /regex/,end -L start,+offset Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| cf0d720 | Andrew Ruder | 27 April 2007, 04:58:58 UTC | Update git-grep documentation Documentation/git-grep.txt: Document -F/--fixed-strings to search for non-regexp patterns. Document -I to not search binary files. Document -<num> as a shortcut for -C<num>. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| 2bc060c | Andrew Ruder | 27 April 2007, 04:58:57 UTC | Update git-fmt-merge documentation Documentation/git-fmt-merge-msg.txt: --summary to list commit summaries on merge --no-summary --file to take merged objects from a file. Configuration option merge.summary Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| 4290529 | Andrew Ruder | 27 April 2007, 04:58:56 UTC | Document additional options for git-fetch Document --quiet/-q and --verbose/-v Add -n as an alternate for --no-tags Fix some whitespace issues Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| 4551d05 | Andrew Ruder | 27 April 2007, 04:58:55 UTC | Removing -n option from git-diff-files documentation -n is not a short form of --no-index as the documentation suggests. Removing it from the documentation and command usage string. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 05:43:10 UTC |
| 8abe88a | Junio C Hamano | 26 April 2007, 06:27:07 UTC | Start preparing for 1.5.1.3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 06:27:07 UTC |
| bf7af11 | Robin H. Johnson | 26 April 2007, 04:53:22 UTC | Sanitize @to recipients. We need to sanitize @to as well to ensure that names are properly quoted. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 06:18:17 UTC |
| 56973d2 | Adam Roben | 25 April 2007, 19:42:58 UTC | git-svn: Ignore usernames in URLs in find_by_url Usernames don't matter for the purposes of find_by_url, so always remove them before doing any comparisons. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 06:05:44 UTC |
| 03044a9 | Robin H. Johnson | 26 April 2007, 02:37:23 UTC | Document --dry-run and envelope-sender for git-send-email. Catch the documentation up with the rest of this patchset. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:15:21 UTC |
| f073a59 | Robin H. Johnson | 26 April 2007, 02:37:22 UTC | Allow users to optionally specify their envelope sender. If your normal user is not the same user you are subscribed to a list with, then the default envelope sender used will cause your messages to bounce or silently vanish into the ether. This patch provides an optional parameter to set the envelope sender. To use it with the sendmail binary, you must have privileges to use the -f parameter! Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:15:16 UTC |
| 2b69bfc | Robin H. Johnson | 26 April 2007, 02:37:21 UTC | Ensure clean addresses are always used with Net::SMTP Always pass in clean addresses to Net::SMTP for the MAIL FROM, and use them on the SMTP non-quiet output as well. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:12:16 UTC |
| c38f024 | Robin H. Johnson | 26 April 2007, 02:37:20 UTC | Validate @recipients before using it for sendmail and Net::SMTP. Ensure that @recipients is only raw addresses when it is handed to the sendmail binary OR Net::SMTP, otherwise BCC cases might get an extra <, or wierd stuff might be passed to the exec. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:11:58 UTC |
| 732263d | Robin H. Johnson | 26 April 2007, 02:37:19 UTC | Perform correct quoting of recipient names. Always perform quoting of the recipient names if they contain periods, previously only the author's address was treated this way. This stops sendmail binaries from exploding the name into bad addresses. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:11:15 UTC |
| af068d2 | Robin H. Johnson | 26 April 2007, 02:37:18 UTC | Change the scope of the $cc variable as it is not needed outside of send_message. $cc is only used inside the send_message scope, so lets clean it out of the global scope. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:03:03 UTC |
| 8e3d436 | Robin H. Johnson | 26 April 2007, 02:37:17 UTC | Debugging cleanup improvements The debug output is much more helpful if it has the parameters that were used. Pull the sendmail parameters into a seperate array for that, and also include similar data during the Net::SMTP case. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:01:40 UTC |
| 71c7da9 | Robin H. Johnson | 26 April 2007, 02:37:16 UTC | Prefix Dry- to the message status to denote dry-runs. While doing testing, it's useful to see that a dry run was actually done, instead of a real one. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 03:59:57 UTC |
| 238cc63 | Robin H. Johnson | 26 April 2007, 02:37:15 UTC | Document --dry-run parameter to send-email. Looks like --dry-run was added to the code, but never to the --help output. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 03:58:46 UTC |
| b03c7a6 | Adam Roben | 25 April 2007, 18:50:32 UTC | git-svn: Don't rely on $_ after making a function call Many functions and operators in perl set $_, so its value cannot be relied upon after calling arbitrary functions. The solution is simply to copy the value of $_ into a local variable that will not get overwritten. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 03:58:02 UTC |
| c21aa54 | Alex Riesen | 25 April 2007, 22:28:17 UTC | Fix handle leak in write_tree This is a quick and dirty fix for the broken "git cherry-pick -n" on some broken OS, which does not remove the directory entry after unlink succeeded(!) if the file is still open somewher. The entry is left but "protected": no open, no unlink, no stat. Very annoying. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 00:34:37 UTC |
| d1efefa | Shawn O. Pearce | 25 April 2007, 08:02:27 UTC | Actually handle some-low memory conditions Tim Ansell discovered his Debian server didn't permit git-daemon to use as much memory as it needed to handle cloning a project with a 128 MiB packfile. Filtering the strace provided by Tim of the rev-list child showed this gem of a sequence: open("./objects/pack/pack-*.pack", O_RDONLY|O_LARGEFILE <unfinished ...> <... open resumed> ) = 5 OK, so the packfile is fd 5... mmap2(NULL, 33554432, PROT_READ, MAP_PRIVATE, 5, 0 <unfinished ...> <... mmap2 resumed> ) = 0xb5e2d000 and we mapped one 32 MiB window from it at position 0... mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...> <... mmap2 resumed> ) = -1 ENOMEM (Cannot allocate memory) And we asked for another window further into the file. But got denied. In Tim's case this was due to a resource limit on the git-daemon process, and its children. Now where are we in the code? We're down inside use_pack(), after we have called unuse_one_window() enough times to make sure we stay within our allowed maximum window size. However since we didn't unmap the prior window at 0xb5e2d000 we aren't exceeding the current limit (which probably was just the defaults). But we're actually down inside xmmap()... So we release the window we do have (by calling release_pack_memory), assuming there is some memory pressure... munmap(0xb5e2d000, 33554432 <unfinished ...> <... munmap resumed> ) = 0 close(5 <unfinished ...> <... close resumed> ) = 0 And that was the last window in this packfile. So we closed it. Way to go us. Our xmmap did not expect release_pack_memory to close the fd its about to map... mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...> <... mmap2 resumed> ) = -1 EBADF (Bad file descriptor) And so the Linux kernel happily tells us f' off. write(2, "fatal: ", 7 <unfinished ...> <... write resumed> ) = 7 write(2, "Out of memory? mmap failed: Bad "..., 47 <unfinished ...> <... write resumed> ) = 47 And we report the bad file descriptor error, and not the ENOMEM, and die, claiming we are out of memory. But actually that mmap should have succeeded, as we had enough memory for that window, seeing as how we released the prior one. Originally when I developed the sliding window mmap feature I had this exact same bug in fast-import, and I dealt with it by handing in the struct packed_git* we want to open the new window for, as the caller wasn't prepared to reopen the packfile if unuse_one_window closed it. The same is true here from xmmap, but the caller doesn't have the struct packed_git* handy. So I'm using the file descriptor instead to perform the same test. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 April 2007, 21:22:24 UTC |
| ce11873 | Adam Roben | 25 April 2007, 01:02:07 UTC | Remove usernames from all commit messages, not just when using svmprops Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 April 2007, 04:40:17 UTC |
| 7d4f4a2 | Junio C Hamano | 24 April 2007, 21:27:00 UTC | applymbox & quiltimport: typofix. 6777c380 fixed only one of three typos introduced in an earlier patch 87ab7992. This fixes the other two. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 21:27:41 UTC |
| b51b8bb | Josh Triplett | 24 April 2007, 07:51:35 UTC | Create a sysconfdir variable, and use it for ETC_GITCONFIG ETC_GITCONFIG defaults to $(prefix)/etc/gitconfig, so if you just set prefix=/usr, you end up with a git that looks in /usr/etc/gitconfig, rather than /etc/gitconfig as specified by the FHS. Furthermore, setting ETC_GITCONFIG does not fix the paths to any future system-wide configuration files. Factor out the path to the system-wide configuration directory into a variable sysconfdir, normally set to $(prefix)/etc, but set to /etc when prefix=/usr . This fixes the prefix=/usr problem for ETC_GITCONFIG, and allows centralized configuration of any future system-wide configuration files without requiring further action from package maintainers or other people building and installing git. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 08:12:36 UTC |
| 41728d6 | Gerrit Pape | 23 April 2007, 12:06:29 UTC | Documentation/git-reset.txt: suggest git commit --amend in example. In example 'Undo a commit and redo', refer to 'git commit --amend', as this is the easier alternative. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 06:55:08 UTC |
| bbc6354 | Junio C Hamano | 24 April 2007, 06:17:41 UTC | Build RPM with ETC_GITCONFIG=/etc/gitconfig Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 06:17:41 UTC |
| ce748f5 | Brian Gernhardt | 24 April 2007, 00:02:34 UTC | Ignore all man sections as they are generated files. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 05:19:36 UTC |
| 6777c38 | Josh Triplett | 24 April 2007, 00:32:04 UTC | Fix typo in git-am: s/Was is/Was it/ Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 April 2007, 05:14:24 UTC |
| 81178fe | Brian Gernhardt | 23 April 2007, 23:56:45 UTC | Reverse the order of -b and --track in the man page. Using "-b --track newbranch oldbranch" gives the error: git checkout: updating paths is incompatible with switching branches/forcing However, "--track -b ..." works just fine. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 April 2007, 23:58:10 UTC |
| c7f34c1 | Johannes Schindelin | 23 April 2007, 08:21:25 UTC | dir.c(common_prefix): Fix two bugs The function common_prefix() is used to find the common subdirectory of a couple of pathnames. When checking if the next pathname matches up with the prefix, it incorrectly checked the whole path, not just the prefix (including the slash). Thus, the expensive part of the loop was executed always. The other bug is more serious: if the first and the last pathname in the list have a longer common prefix than the common prefix for _all_ pathnames in the list, the longer one would be chosen. This bug was probably hidden by the fact that bash's wildcard expansion sorts the results, and the code just so happens to work with sorted input. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 April 2007, 08:44:00 UTC |
| 9731706 | Junio C Hamano | 21 April 2007, 20:57:07 UTC | GIT 1.5.1.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 20:57:07 UTC |
| 4a40cbd | Eric Wong | 21 April 2007, 07:55:00 UTC | perl: install private Error.pm if the site version is older than our own bdash (on IRC) had a problem with Git.pm (via git-svn) when his site installation of Error.pm was older than the version we package. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 20:06:24 UTC |
| 928c210 | Junio C Hamano | 21 April 2007, 00:25:27 UTC | git-clone: fix dumb protocol transport to clone from pack-pruned ref This forward-ports a fix from 2986c022 to git-clone. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 00:25:27 UTC |
| 9bc20aa | Andrew Ruder | 19 April 2007, 03:03:37 UTC | Update git-config documentation Documentation/git-config.txt: Added documentation for --system Documentation/builtin-config.c: Added --system to the short usage Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:08:16 UTC |
| c91ee27 | Andrew Ruder | 19 April 2007, 03:03:31 UTC | Fix unmatched emphasis tag in git-tutorial In asciidoc 7.1.2 and prior there is no obvious way to get: 'add'ing to emphasize only the "add", instead it treats the first apostrophe as the beginning of an emphasis, and the second apostrophe as a regular apostrophe and makes the rest of the line an emphasis since there is no closing apostrophe. In the newer asciidoc you can do it pretty easily with __add__ing but I'm not sure it would be best to make that a prereq for something as silly as this. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:08:03 UTC |
| 6b04600 | Andrew Ruder | 19 April 2007, 03:03:26 UTC | Update git-cherry-pick documentation Documentation/git-cherry-pick.txt: Remove --replay as it is not handled by the code (-r is however). Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:07:57 UTC |
| 27c8f8c | Andrew Ruder | 19 April 2007, 03:03:14 UTC | Update git-archive documentation Documentation/git-archive.txt: Document -v/--verbose option. Add -l as short form of --list. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:06:21 UTC |
| 6e6db39 | Andy Whitcroft | 19 April 2007, 02:08:15 UTC | fix up strtoul_ui error handling Two scanf() calls were converted to strtoul_ui() but the return values were not updated to match. scanf() returns the number of matched "values" which for this usage is 1 on success. strtoul_ui() return 0 on success. Update these call sites to match. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 02:26:33 UTC |
| 9f1beb7 | Sam Vilain | 18 April 2007, 23:51:21 UTC | git-tar-tree: complete deprecation conversion message The syntax for git-archive is different; warn about it in the deprecation message on the manual page. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 00:57:25 UTC |
| 0ad64fd | Frank Lichtenheld | 18 April 2007, 22:10:22 UTC | git-shortlog: Fix two formatting errors in asciidoc documentation First use [verse] in the SYNOPSIS so that the line break actually shows. Secondly drop the quotes around '.mailmap' since this exposes a bug in our toolchain (didn't bother enough yet to find out wether it is asciidoc's fault or that of the XSL templates) that leads to the dot not getting escaped correctly in the roff output and thereby swallowing the line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 22:41:59 UTC |
| 0afa764 | Alex Riesen | 18 April 2007, 21:58:56 UTC | Fix overwriting of files when applying contextually independent diffs Noticed by applying two diffs of different contexts to the same file. The check for existence of a file was wrong: the test assumed it was a directory and reset the errno (twice: directly and by calling lstat). So if an entry existed and was _not_ a directory no attempt was made to rename into it, because the errno (expected by renaming code) was already reset to 0. This resulted in error: fatal: unable to write file file mode 100644 For Linux, removing "errno = 0" is enough, as lstat wont modify errno if it was successful. The behavior should not be depended upon, though, so modify the "if" as well. The test simulates this situation. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 22:33:01 UTC |
| 0c1ec5a | Eric Wong | 18 April 2007, 07:17:33 UTC | git-svn: don't allow globs to match regular files git only tracks the histories of full directories, not that of individual files. Sometimes, SVN users will place[1] a regular file in the directory designated for subdirectories of branches or tags. Thanks to jrockway on #git for pointing this out. [1] mistakenly or otherwise, such as a README Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 19:39:04 UTC |
| 1401f46 | Carlos Rica | 18 April 2007, 03:34:34 UTC | Use const qualifier for 'sha1' parameter in delete_ref function delete_ref function does not change the 'sha1' parameter. Non-const pointer causes a compiler warning if you call to the function using a const argument. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 05:00:18 UTC |
| ab60294 | Junio C Hamano | 18 April 2007, 00:32:23 UTC | Start preparing for 1.5.1.2 | 18 April 2007, 00:47:59 UTC |
| 0220f1e | Junio C Hamano | 18 April 2007, 00:16:41 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Brown paper bag fix division by 0 in blame | 18 April 2007, 00:16:41 UTC |
| c284914 | Eric Wong | 17 April 2007, 09:41:43 UTC | git-svn: quiet some warnings when run only with --version/--help These are harmless but annoying. They were introduced in 512b620bd9fef7f170562ecad835e37479f051ce Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2007, 10:33:22 UTC |
| d627de6 | Eric Wong | 15 April 2007, 10:01:29 UTC | git-svn: respect lower bound of -r/--revision when following parent When an explicit --revision argument is specified, do not fetch past the specified range into the beginning of history. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2007, 10:33:22 UTC |
| 9177649 | Gerrit Pape | 16 April 2007, 08:31:35 UTC | Have sample update hook not refuse deleting a branch through push. source ref might be 0000...0000 to delete a branch through git-push, 'git <remote> push :<branch>'. The update hook should not decline this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:35:39 UTC |
| 5946d88 | Gerrit Pape | 16 April 2007, 08:30:42 UTC | variable $projectdesc needs to be set before checking against unchanged default. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:35:33 UTC |
| 635f4a3 | Andrew Ruder | 16 April 2007, 06:20:34 UTC | Update git-annotate/git-blame documentation Moved options that pertained to both git-blame and git-annotate to a common file blame-options.txt. builtin-blame.c: Removed --compatibility, --long, --time from the short usage as they are not handled in the code. Documentation/git-blame.txt: Removed common options to git-annotate. Added documentation for --score-debug. Removed --compatibility. Adjusted usage at top to not wrap on 80 columns. Documentation/git-annotate.txt: Using common options blame-options.txt. Documentation/blame-options.txt: Added -b note about associated config option, added --root note about associated config option, added documentation for --show-stats. Removed --long, --time, --rev-file as those options do not really exist. Added documentation for -M/-C taking an optional score argument for detection of moved lines. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:14:46 UTC |
| 0b9a9dd | Andrew Ruder | 16 April 2007, 06:20:40 UTC | Update git-apply documentation Document -v (short form of --verbose). Redo usage to not wrap on 80 column terminal with typical settings. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:14:46 UTC |
| 982f65a | Andrew Ruder | 16 April 2007, 06:40:06 UTC | Update git-applymbox documentation Documentation/git-applymbox.txt: updating -u documentation to include fact that it encodes to the i18n.commitencoding setting, not just utf-8. Added documentation of -n option to pass -n to git-mailinfo. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:14:46 UTC |
| 5c19f24 | Andrew Ruder | 16 April 2007, 07:21:31 UTC | Update git-am documentation Documentation/git-am.txt missing several short versions of options. Added documentation for --resolvemsg=<msg> command-line option. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:14:46 UTC |
| 25d9f3f | J. Bruce Fields | 16 April 2007, 04:37:16 UTC | user-manual: use detached head when rewriting history This is slightly simpler if we use a detached head. And it's probably good to have another example that uses this feature. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:29 UTC |
| a536b08 | J. Bruce Fields | 16 April 2007, 04:37:15 UTC | user-manual: start revising "internals" chapter Minor revisions, cross-references. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:29 UTC |
| 72a76c9 | J. Bruce Fields | 16 April 2007, 04:37:14 UTC | user-manual: detached HEAD Add a brief mention of detached HEADs and .git/HEAD. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:29 UTC |
| 4f75240 | J. Bruce Fields | 16 April 2007, 04:37:13 UTC | user-manual: fix discussion of default clone The name "master" isn't actually quite so special. Also, fix some bad grammar. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:28 UTC |
| b710830 | J. Bruce Fields | 16 April 2007, 04:37:12 UTC | Documentation: clarify track/no-track option. Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:28 UTC |
| 40c8279 | J. Bruce Fields | 16 April 2007, 04:37:11 UTC | Documentation: clarify git-checkout -f, minor editing "Force a re-read of everything" doesn't mean much to me. Also some minor grammar fixes. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:28 UTC |
| cb1881c | J. Bruce Fields | 16 April 2007, 04:37:10 UTC | Documentation: minor edits of git-lost-found manpage Minor improvements to grammar and clarity of lost-found manpage. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:28 UTC |
| 5f2e1df | Alex Riesen | 15 April 2007, 22:36:06 UTC | Document -g (--walk-reflogs) option of git-log Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2007, 23:05:24 UTC |
| 61d6ed1 | Jim Meyering | 09 April 2007, 23:01:44 UTC | sscanf/strtoul: parse integers robustly * builtin-grep.c (strtoul_ui): Move function definition from here, to... * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter. * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10". * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer that is out of range or merely larger than INT_MAX. (cmd_update_index): Use strtoul_ui, not sscanf. * convert-objects.c (write_subdirectory): Likewise. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2007, 02:47:20 UTC |
| e94b4d2 | Junio C Hamano | 15 April 2007, 02:45:16 UTC | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint * git://git2.kernel.org/pub/scm/gitk/gitk: [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere. | 15 April 2007, 02:45:16 UTC |
| 1bb88be | Michael Spang | 14 April 2007, 21:26:20 UTC | git-blame: Fix overrun in fake_working_tree_commit() git-blame would overflow commit->buffer when annotating files with long paths. Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2007, 00:37:28 UTC |
| 1fa9bf3 | Linus Torvalds | 13 April 2007, 21:34:18 UTC | git-quiltimport complaining yet still working There were two bugs: "stop_here" doesn't exist, but the bug that causes this code to trigger in the *first* place is the wrong use of "$dotest". It should be ".dotest" This is essentially the same bug introduced by 87ab7992, one was fixed with 0d38ab25 but this was somehow left behind. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 10:39:36 UTC |
| befc9c4 | Frank Lichtenheld | 13 April 2007, 16:02:33 UTC | config.txt: Fix grammatical error in description of http.noEPSV s/doesn't/don't/ since "ftp servers" is plural Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:39:28 UTC |
| 5007af8 | Frank Lichtenheld | 13 April 2007, 16:02:32 UTC | config.txt: Change pserver to server in description of gitcvs.* These variables apply to the SSH access as well, so don't use pserver here which might confuse users. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:39:28 UTC |
| 5cb71f8 | Frank Lichtenheld | 13 April 2007, 16:02:31 UTC | config.txt: Document core.autocrlf Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:39:28 UTC |
| eabb0bf | Frank Lichtenheld | 13 April 2007, 16:02:30 UTC | config.txt: Document gitcvs.allbinary Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:39:28 UTC |
| 1ad029b | Junio C Hamano | 13 April 2007, 10:23:20 UTC | Do not default to --no-index when given two directories. git-diff -- a/ b/ always defaulted to --no-index, primarily because the function is_in_index() was implemented quite incorrectly. Noticed by Patrick Maaß and Simon Schubert independently, initial patch was provided by Patrick but I fixed it differently. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:34:35 UTC |
| dc61b10 | Alex Riesen | 13 April 2007, 22:19:05 UTC | Use rev-list --reverse in git-rebase.sh ...and drop the last perl dependency in the script. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:06:40 UTC |
| e4b0233 | Matthias Lederhofer | 12 April 2007, 18:52:03 UTC | handle_options in git wrapper miscounts the options it handled. handle_options did not count the number of used arguments correctly. When --git-dir was used the extra argument was not added to the number of handled arguments. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2007, 00:46:51 UTC |
| 9b11d24 | Junio C Hamano | 11 April 2007, 21:39:07 UTC | GIT 1.5.1.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2007, 00:19:36 UTC |
| cb52d9a | Frank Lichtenheld | 11 April 2007, 20:38:19 UTC | cvsserver: Fix handling of diappeared files on update Only send a modified response if the client sent a "Modified" entry. This fixes the case where the file was locally deleted on the client without being removed from CVS. In this case the client will only have sent the Entry for the file but nothing else. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Martin Langhoff <martin@catalyst.net.nz> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2007, 23:55:33 UTC |
| 8eb2d0b | Junio C Hamano | 11 April 2007, 08:28:43 UTC | fsck: do not complain on detached HEAD. Detached HEAD is just a normal state of a repository. Do not say anything about it. Do not give worrying "error:" messages when we let the user know that the HEAD points at nothing (i.e. yet to be born branch), nor we do not have any default refs to start following the objects chain. Reword them as "notice:". Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2007, 21:05:36 UTC |
| f981577 | Jim Meyering | 09 April 2007, 22:56:33 UTC | (encode_85, decode_85): Mark source buffer pointer as "const". Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2007, 07:51:20 UTC |
| 8bd26c4 | Julian Phillips | 09 April 2007, 20:57:36 UTC | Documentation: show-ref: document --exclude-existing Use the comment in the code to document the --exclude-existing function to git-show-ref. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2007, 01:54:52 UTC |
| fc1f458 | Tomash Brechko | 09 April 2007, 11:24:02 UTC | cvsexportcommit -p : fix the usage of git-apply -C. Unlike 'patch --fuzz=NUM', which specifies the number of lines allowed to mismatch, 'git-apply -CNUM' requests the match of NUM lines of context. Omitting -C requests full context match, and that's what should be used for cvsexportcommit -p. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2007, 01:52:41 UTC |
| 24c64d6 | Junio C Hamano | 09 April 2007, 05:14:16 UTC | Add Documentation/cmd-list.made to .gitignore Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2007, 05:14:16 UTC |
| c16d087 | Eric Wong | 08 April 2007, 07:59:22 UTC | git-svn: fix log command to avoid infinite loop on long commit messages This bug has been around since the the conversion to use the Git.pm library back in October or November. Eventually I'd like "git rev-list/log" to have the option to not truncate overly long messages. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2007, 02:54:07 UTC |
