| 9159afb | Junio C Hamano | 06 May 2007, 08:07:04 UTC | GIT v1.5.2-rc2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 08:07:04 UTC |
| 125a5f1 | Junio C Hamano | 06 May 2007, 07:21:03 UTC | Merge branch 'maint' * maint: Small correction in reading of commit headers Documentation: fix typo in git-remote.txt Add test for blame corner cases. blame: -C -C -C blame: Notice a wholesale incorporation of an existing file. Fix --boundary output diff format documentation: describe raw combined diff format Mention version 1.5.1 in tutorial and user-manual Add --no-rebase option to git-svn dcommit Fix markup in git-svn man page | 06 May 2007, 07:21:03 UTC |
| cc0e6c5 | Alex Riesen | 04 May 2007, 21:54:57 UTC | Handle return code of parse_commit in revision machinery This fixes a crash in broken repositories where random commits suddenly disappear. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 07:07:07 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 |
| 86b9e01 | Jonas Fonseca | 01 May 2007, 07:24:59 UTC | git-tag(1): -v option is a subcommand; fix code block When the -v is passed, git-tag will exit after it is processed like it does with the -d and -l options. Additionally, missing code block caused wrong rendering of an option example. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 06:27:03 UTC |
| ff06c74 | Shawn O. Pearce | 01 May 2007, 06:08:23 UTC | Improve request-pull to handle non-rebased branches This is actually a few different changes to request-pull, making it slightly smarter: 1) Minor cleanup of revision->base variable names, making it follow the head/headrev naming convention that is already in use. 2) Compute the merge-base between the two revisions upfront and reuse that selected merge-base to create the diffstat. 3) Refuse to generate a pull request for branches that have no existing relationship. These aren't very common and would mess up our diffstat generation. 4) Disable the PAGER when running shortlog and diff, as these would otherwise activate the pager for each command when git-request-pull is run on a tty. Instead users can get the entire output paged (if desired) using `git -p request-pull`. 5) Use shortlog rather than `git log | git shortlog` now that recent shortlog versions are able to run the revision listing internally. 6) Attempt to resolve the input URL using the user's configured remotes. This is useful if the URL you want the recipient to see is also the one you used to push your changes. If not a config-file remote could easily be setup for the public URL and request-pull could be passed that name instead. 7) Automatically guess and include the remote branch name in the body of the message. We list the branch name immediately after the URL, making it easy for the recipient to copy and paste the entire line onto a `git pull` command line. Rumor has it Linus likes this format, for exactly that reason. If multiple branches at the remote match $headrev we take the first one returned by peek-remote and assume it is suitable. If no branches are available we warn the user about the problem, but insert a static string that is not a valid branch name and would be obvious to anyone reading the message as being totally incorrect. This allows users to still generate a template message without network access (for example) and hand-correct the bits that cannot be verified. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 06:27:03 UTC |
| 9aae177 | Junio C Hamano | 04 May 2007, 06:26:54 UTC | Merge branch 'maint' * maint: gitweb: use decode_utf8 directly posix compatibility for t4200 Document 'opendiff' value in config.txt and git-mergetool.txt Allow PERL_PATH="/usr/bin/env perl" Make xstrndup common diff.c: fix "size cache" handling. http-fetch: Disable use of curl multi support for libcurl < 7.16. | 04 May 2007, 06:26:54 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 |
| 50acc58 | Junio C Hamano | 03 May 2007, 06:58:14 UTC | blame: use .mailmap unconditionally There really isn't any point in turning off .mailmap. The number of mailmap lookups are bounded by number of lines in the target file, and the real blame processing is much more expensive. If it turns out to be too costly, we should optimize the mailmap lookup itself, instead of avoiding the call. If the author information of commits of the project are relatively clean, .mailmap would have only small number of entries, and the overhead of looking it up will not be high. On the other hand, if the author information is really screwed up that a good .mailmap needs to be maintained to run shortlog, giving uncleaned names in blame output is not helpful at all either. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 May 2007, 07:03:15 UTC |
| 6644d2f | Junio C Hamano | 02 May 2007, 18:27:31 UTC | Merge branch 'maint' * maint: cvsserver: Handle re-added files correctly Fix compilation of test-delta | 02 May 2007, 18:27:31 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 |
| b3431bc | Shawn O. Pearce | 02 May 2007, 16:59:55 UTC | Don't use seq in tests, not everyone has it For example Mac OS X lacks the seq command. So we cannot use it there. A good old while loop works just as good. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 17:24:23 UTC |
| cbc6bda | Shawn O. Pearce | 02 May 2007, 16:14:15 UTC | Reuse fixup_pack_header_footer in index-pack Now that fast-import is using a "library function" to handle correcting its packfile's object count and trailing SHA-1 we should reuse the same function in index-pack, to reduce the size of the code we must maintain. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 17:24:21 UTC |
| 8b0eca7 | Dana L. How | 02 May 2007, 16:13:14 UTC | Create pack-write.c for common pack writing code Include a generalized fixup_pack_header_footer() in this new file. Needed by git-repack --max-pack-size feature in a later patchset. [sp: Moved close(pack_fd) to callers, to support index-pack, and changed name to better indicate it is for packfiles.] Signed-off-by: Dana L. How <danahow@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 17:24:18 UTC |
| db81e67 | Shawn O. Pearce | 02 May 2007, 17:24:10 UTC | Merge branch 'gfi-maint' into gfi-master * gfi-maint: Teach import-tars about GNU tar's @LongLink extension. | 02 May 2007, 17:24:10 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 |
| 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 |
| 4c16112 | Junio C Hamano | 01 May 2007, 00:30:02 UTC | GIT v1.5.2-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 May 2007, 00:30:02 UTC |
| 07c785d | Junio C Hamano | 01 May 2007, 00:16:19 UTC | Merge branch 'maint' * maint: GIT v1.5.1.3 send-email documentation: clarify --smtp-server git.7: Mention preformatted html doc location Clarify SubmittingPatches Checklist git-svn: Add 'find-rev' command Fix symlink handling in git-svn, related to PerlIO | 01 May 2007, 00:16:19 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 |
| fe5d30b | Alex Riesen | 30 April 2007, 22:31:52 UTC | Include mailmap.h in mailmap.c to catch mailmap interface changes Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:57:59 UTC |
| e44b5d1 | Alex Riesen | 30 April 2007, 22:27:05 UTC | Remove pointless calls to access(2) when checking for .mailmap read_mailmap already returns not 0 in case of error, and nothing seem to be interested in it. It also is silent about the fact (read_mailmap being to chatty would justify the call to access, but there is no point for it to be and it isn't). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:57:52 UTC |
| 8503ee4 | Alex Riesen | 30 April 2007, 22:26:36 UTC | Fix read_mailmap to handle a caller uninterested in repo abbreviation The only such a caller builtin-blame.c would pass NULL as the place where to store the abbreviation. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:57:50 UTC |
| 600682a | Alex Riesen | 30 April 2007, 22:22:53 UTC | Use strlcpy instead of strncpy in mailmap.c strncpy does not NUL-terminate output in case of output buffer too short, and map_email prototype (and usage) does not allow for figuring out what the length of the name is. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:57:47 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 |
| a07157a | Junio C Hamano | 29 April 2007, 18:01:27 UTC | Merge branch 'jc/attr' * jc/attr: Add 'filter' attribute and external filter driver definition. Add 'ident' conversion. | 29 April 2007, 18:01:27 UTC |
| 96651ef | Junio C Hamano | 28 April 2007, 22:32:49 UTC | Make sure test-genrandom and test-chmtime are builtas part of the main build. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:11 UTC |
| e0173ad | Junio C Hamano | 29 April 2007, 06:38:52 UTC | Make macros to prevent double-inclusion in headers consistent. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:11 UTC |
| f956738 | Junio C Hamano | 27 April 2007, 07:42:15 UTC | Apply mailmap in git-blame output. This makes git-blame to use the same mailmap used by git-shortlog. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:06 UTC |
| 7c1c678 | Junio C Hamano | 27 April 2007, 07:41:15 UTC | Split out mailmap handling out of shortlog This splits out a few functions to deal with mailmap from shortlog and makes it a bit more usable from other programs. Most notably, it does not clobber input e-mail address anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:06 UTC |
| 093dc5b | Junio C Hamano | 12 April 2007, 22:50:45 UTC | blame -s: suppress author name and time. With this "git blame -b -s HEAD~n..HEAD" becomes a nicer way to review the result of recent changes in context. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:06 UTC |
| 28a94f8 | Josh Triplett | 29 April 2007, 01:40:28 UTC | Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL Some other programs get the user's email address from $EMAIL, so fall back to that if we don't have a Git-specific email address. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 09:05:06 UTC |
| 25dc5e2 | Junio C Hamano | 29 April 2007, 08:54:28 UTC | Merge commit 'gfi/master' * commit 'gfi/master': | 29 April 2007, 08:54:28 UTC |
| 39231b1 | Junio C Hamano | 29 April 2007, 08:52:43 UTC | Merge branch 'maint' * maint: http.c: Fix problem with repeated calls of http_init Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Fix import-tars fix. Update .mailmap with "Michael" Do not barf on too long action description Catch empty pathnames in trees during fsck Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes git-svn: Added 'find-rev' command git shortlog documentation: add long options and fix a typo | 29 April 2007, 08:52:43 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 |
| aff787b | Shawn O. Pearce | 29 April 2007, 00:05:58 UTC | Merge branch 'gfi-maint' into gfi-master * gfi-maint: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes | 29 April 2007, 00:05:58 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 |
| 4342572 | Junio C Hamano | 27 April 2007, 06:29:09 UTC | Merge branch 'maint' * maint: 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 | 27 April 2007, 06:29:09 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 |
| c855195 | Andy Parkins | 26 April 2007, 21:37:16 UTC | post-receive-email example hook: sed command for getting description was wrong The sed command that extracted the first line of the project description didn't include the -n switch and hence the project name was being printed twice. This was ruining the email header generation because it was assumed that the description was only one line and was included in the subject. This turned the subject into a two line item and prematurely finished the header. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 03:59:55 UTC |
| 024e5b3 | Andy Parkins | 26 April 2007, 21:36:24 UTC | post-receive-email example hook: detect rewind-only updates and output sensible message Sometimes a non-fast-forward update doesn't add new commits, it merely removes old commits. This patch adds support for detecting that and outputting a more correct message. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 03:59:49 UTC |
| 8e404f8 | Andy Parkins | 26 April 2007, 21:35:39 UTC | post-receive-email example hook: fastforward should have been fast_forward Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2007, 03:58:04 UTC |
| 0d5e6c9 | Alex Riesen | 26 April 2007, 19:13:49 UTC | Ignore merged status of the file-level merge as it is not relevant for whether the result should be written. Even if no real merge happened, there might be _no_ reason to rewrite the working tree file. Maybe even more so. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 23:11:39 UTC |
| 8a35981 | Alex Riesen | 25 April 2007, 20:07:45 UTC | Add a test for merging changed and rename-changed branches Also leave a warning for future merge-recursive explorers. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 06:43:16 UTC |
| c135ee8 | Alex Riesen | 25 April 2007, 20:06:59 UTC | Avoid excessive rewrites in merge-recursive If a file is changed in one branch, and renamed and changed to the same content in another branch than we can skip the rewrite of this file in the working directory, as the content does not change. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 06:43:16 UTC |
| 6169a89 | Junio C Hamano | 26 April 2007, 06:31:45 UTC | Merge branch 'maint' * maint: 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. git-svn: Don't rely on $_ after making a function call Fix handle leak in write_tree Actually handle some-low memory conditions Conflicts: RelNotes git-send-email.perl | 26 April 2007, 06:31:45 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 |
| a7b02cc | Junio C Hamano | 25 April 2007, 06:36:22 UTC | Add --date={local,relative,default} This adds --date={local,relative,default} option to log family of commands, to allow displaying timestamps in user's local timezone, relative time, or the default format. Existing --relative-date option is a synonym of --date=relative; we could probably deprecate it in the long run. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2007, 04:39:43 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 |
| 3e0a93a | Luiz Fernando N. Capitulino | 25 April 2007, 14:18:41 UTC | init_buffer(): Kill buf pointer We don't need it, it's possible to assign the block of memory to bufp Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 April 2007, 20:45:12 UTC |
