| 1cc202b | Junio C Hamano | 09 May 2007, 05:10:56 UTC | GIT v1.5.1.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2007, 05:11:17 UTC |
| 22f0958 | Quy Tonthat | 08 May 2007, 14:19:41 UTC | Add howto files to rpm packages. RPM packages did not include howto files which causes broken links in howto-index.html Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2007, 05:09:04 UTC |
| b51be13 | Amos Waterland | 08 May 2007, 04:46:08 UTC | wcwidth redeclaration Build fails for git 1.5.1.3 on AIX, with the message: utf8.c:66: error: conflicting types for 'wcwidth' /.../lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.3/include/string.h:266: error: previous declaration of 'wcwidth' was here Fix this by renaming our static variant to our own name. Signed-off-by: Amos Waterland <apw@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2007, 05:02:40 UTC |
| 52c8003 | J. Bruce Fields | 08 May 2007, 03:34:26 UTC | user-manual: fix clone and fetch typos More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2007, 04:25:09 UTC |
| 53a5824 | Junio C Hamano | 07 May 2007, 21:46:15 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Allow spaces in path to 'wish' | 07 May 2007, 21:46:15 UTC |
| bff898b | Junio C Hamano | 07 May 2007, 21:40:41 UTC | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint * git://git2.kernel.org/pub/scm/gitk/gitk: gitk: Allow user to choose whether to see the diff, old file, or new file | 07 May 2007, 21:40:41 UTC |
| 604d7a1 | Jeff King | 07 May 2007, 05:28:34 UTC | Documentation: don't reference non-existent 'git-cvsapplycommit' Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2007, 06:30:38 UTC |
| a1dc34f | J. Bruce Fields | 07 May 2007, 05:01:42 UTC | user-manual: stop deprecating the manual It's just as much a work-in-progress, but at least now it's gotten enough technical review to shake out most of the really bad lies, so hopefully it doesn't do any actual damage. And if we encourage people to read it, they'll be more likely to whine about it, which will help get it fixed faster. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| c64415e | J. Bruce Fields | 07 May 2007, 04:56:45 UTC | user-manual: miscellaneous editing I cherry-picked some additional miscellaneous fixes from those suggested by Santi Béjar, including fixes to: - correct discussion of repository/HEAD->repository shortcut - add mention of git-mergetool - add mention of --track - mention "-f" as well as "+" for fetch Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| 58c19d1 | J. Bruce Fields | 07 May 2007, 04:16:33 UTC | user-manual: fix .gitconfig editing examples Santi Béjar points out that when telling people how to "introduce themselves" to git we're advising them to replace their entire .gitconfig file. Fix that. Cc: "Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| 5972304 | J. Bruce Fields | 30 April 2007, 15:11:02 UTC | user-manual: clean up fast-forward and dangling-objects sections The previous commit calls attention to the fact that we have two sections each devoted to fast-forwards and to dangling objects. Revise and attempt to differentiate them a bit. Some more reorganization may be required later.... Signed-off-by: J. Bruce Fields | 07 May 2007, 05:03:52 UTC |
| e34caac | J. Bruce Fields | 18 April 2007, 04:46:19 UTC | user-manual: add section ID's Any section lacking an id gets an annoying warning when you build the manual. More seriously, the table of contents then generates volatile id's which change with every build, with the effect that we get URL's that change all the time. The ID's are manually generated and sometimes inconsistent, but that's OK. XXX: what to do about the preface? Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:52 UTC |
| 953f3d6 | J. Bruce Fields | 18 April 2007, 04:20:46 UTC | user-manual: more discussion of detached heads, fix typos Nicolas Pitre pointed out a couple typos and some room for improvement in the discussion of detached heads. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Cc: Nicolas Pitre <nico@cam.org> | 07 May 2007, 05:03:52 UTC |
| e102d43 | Alex Riesen | 04 May 2007, 21:51:32 UTC | Small correction in reading of commit headers Check if a line of the header has enough characters to possibly contain the requested prefix. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 06:46:18 UTC |
| cf593cc | James Bowes | 05 May 2007, 18:23:12 UTC | Documentation: fix typo in git-remote.txt Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 06:10:59 UTC |
| c2a0636 | Junio C Hamano | 06 May 2007, 05:36:19 UTC | Add test for blame corner cases. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:39 UTC |
| c63777c | Junio C Hamano | 06 May 2007, 04:18:57 UTC | blame: -C -C -C When you do this, existing "blame -C -C" would not find that the latter half of the file2 came from the existing file1: ... both file1 and file2 are tracked ... $ cat file1 >>file2 $ git add file1 file2 $ git commit This is because we avoid the expensive find-copies-harder code that makes unchanged file (in this case, file1) as a candidate for copy & paste source when annotating an existing file (file2). The third -C now allows it. However, this obviously makes the process very expensive. We've actually seen this patch before, but I dismissed it because it covers such a narrow (and arguably stupid) corner case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:27 UTC |
| dd166aa | Junio C Hamano | 05 May 2007, 16:13:26 UTC | blame: Notice a wholesale incorporation of an existing file. The -C option to blame tries to find a section of a preimage file by running diff against the lines whose origin is still unknown, and excluding the different parts. The code however did not cover the case where the tail part of the section matched, which we handle for the normal non-move/copy codepath. This breakage was most visible when preimage file matches in its entirety and failed to pass blame in such a case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:13 UTC |
| e330a40 | Linus Torvalds | 05 May 2007, 22:18:03 UTC | Fix --boundary output "git log --boundary" incorrectly honoured the option only when "left-right" was enabled. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 04:09:34 UTC |
| 3b559ea | Jakub Narebski | 04 May 2007, 22:48:35 UTC | diff format documentation: describe raw combined diff format Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 23:58:17 UTC |
| 71f4b18 | Carl Worth | 04 May 2007, 18:27:10 UTC | Mention version 1.5.1 in tutorial and user-manual Most other documentation will frequently be read from an installation of git so will naturally be associated with the installed version. But these two documents in particular are often read from web pages while users are still exploring git. It's important to mention version 1.5.1 since these documents provide example commands that won't work with previous versions of git. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 23:58:03 UTC |
| 171af11 | Karl Hasselström | 03 May 2007, 05:51:35 UTC | Add --no-rebase option to git-svn dcommit git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström <kha@treskal.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 22:08:31 UTC |
| cc1793e | Karl Hasselström | 04 May 2007, 07:03:22 UTC | Fix markup in git-svn man page Some of the existing markup was just plain broken, and some subcommand options weren't indented properly. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 22:03:48 UTC |
| e3ad95a | Ismail Dönmez | 01 May 2007, 21:12:13 UTC | gitweb: use decode_utf8 directly Using decode() tries to decode data that is already UTF-8 and borks, but decode_utf8 from Encode.pm has a built-in safety against that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 06:22:12 UTC |
| c256acb | Bryan Larsen | 02 May 2007, 21:53:23 UTC | posix compatibility for t4200 Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:58:01 UTC |
| e4e92b3 | Arjen Laarhoven | 03 May 2007, 18:29:15 UTC | Document 'opendiff' value in config.txt and git-mergetool.txt Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:56:23 UTC |
| 5318f69 | Bryan Larsen | 03 May 2007, 22:58:56 UTC | Allow PERL_PATH="/usr/bin/env perl" There is a mechanism PERL_PATH in the Makefile to specify path to Perl binary, but sometimes it is convenient to let 'env' figure out where Perl comes from, with PERL_PATH="/usr/bin/env perl". Allowing this would make things easier to MacPorts, where we wish to work with the MacPorts perl if it is installed, but fall back to the system perl if it isn't. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:36:32 UTC |
| 5094102 | Daniel Barkalow | 03 May 2007, 02:49:41 UTC | Make xstrndup common This also improves the implementation to match how strndup is specified (by GNU): if the length given is longer than the string, only the string's length is allocated and copied, but the string need not be null-terminated if it is at least as long as the given length. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:28:55 UTC |
| cdda666 | Junio C Hamano | 03 May 2007, 20:00:43 UTC | diff.c: fix "size cache" handling. We broke the size-cache handling when we changed the function signature of sha1_object_info() in 21666f1a. We obviously wanted to cache the size we obtained when sha1_object_info() succeeded, not when it failed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:12:40 UTC |
| 9cf0430 | Alexandre Julliard | 02 May 2007, 12:53:23 UTC | http-fetch: Disable use of curl multi support for libcurl < 7.16. curl_multi_remove_handle() is broken in libcurl < 7.16, in that it doesn't correctly update the active handles count when a request is aborted. This causes the transfer to hang forever waiting for the handle count to become less than the number of active requests. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:12:40 UTC |
| 7a33b0b | Junio C Hamano | 02 May 2007, 18:00:16 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Teach import-tars about GNU tar's @LongLink extension. | 02 May 2007, 18:00:16 UTC |
| a7da9ad | Frank Lichtenheld | 02 May 2007, 00:43:14 UTC | cvsserver: Handle re-added files correctly We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 May 2007, 17:41:52 UTC |
| 775477a | Johannes Schindelin | 01 May 2007, 21:42:44 UTC | Teach import-tars about GNU tar's @LongLink extension. This extension allows GNU tar to process file names in excess of the 100 characters defined by the original tar standard. It does this by faking a file, named '././@LongLink' containing the true file name, and then adding the file with a truncated name. The idea is that tar without this extension will write out a file with the long file name, and write the contents into a file with truncated name. Unfortunately, GNU tar does a lousy job at times. When truncating results in a _directory_ name, it will happily use _that_ as a truncated name for the file. An example where this actually happens is gcc-4.1.2, where the full path of the file WeThrowThisExceptionHelper.java truncates _exactly_ before the basename. So, we have to support that ad-hoc extension. This bug was noticed by Chris Riddoch on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 17:22:34 UTC |
| 681bfd5 | Shawn O. Pearce | 02 May 2007, 16:44:44 UTC | git-gui: Allow spaces in path to 'wish' If the path of our wish executable that are running under contains spaces we need to make sure they are escaped in a proper Tcl list, otherwise we are unable to start gitk. Reported by Randal L. Schwartz on #git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 16:44:44 UTC |
| adb7b5f | Martin Koegler | 01 May 2007, 09:47:55 UTC | Fix compilation of test-delta The code used write_in_full() without pulling its declarations from the header file. When header is included, usage[] collides with usage() function. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 May 2007, 09:59:08 UTC |
| 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 |
| a8d610a | Paul Mackerras | 19 April 2007, 01:39:12 UTC | gitk: Allow user to choose whether to see the diff, old file, or new file This adds a set of radiobuttons that select between displaying the full diff (both - and + lines), the old file (suppressing the + lines) and the new file (suppressing the - lines) in the diff display window. Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 April 2007, 01:39:12 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 |
