| 77599cc | Junio C Hamano | 23 May 2008, 22:52:43 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref | 23 May 2008, 22:52:43 UTC |
| e00f379 | Johannes Sixt | 23 May 2008, 14:13:05 UTC | rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref The intention of --symbolic-full-name is to not print anything if a revision is not an exact ref. But this command: $ git-rev-parse --symbolic-full-name --not master~1 still emitted a sole '^' to stdout (provided that there's no other ref at master~1). This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 22:52:20 UTC |
| 26b4d00 | Heikki Orsila | 22 May 2008, 15:24:41 UTC | Add missing "short" alternative to --date in rev-list-options.txt Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:29:46 UTC |
| 3a3e097 | Jon Loeliger | 22 May 2008, 19:59:25 UTC | git-show.txt: Not very stubby these days. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:30 UTC |
| c30f993 | Shawn O. Pearce | 22 May 2008, 12:47:19 UTC | Clarify repack -n documentation While repacking a local repository a coworker thought the -n option was necessary to git-repack to keep it from updating some unknown file on the central server we all share. Explaining further what the option is (not) doing helps to make it clear the option does not impact any remote repositories the user may have configured. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:29 UTC |
| 008442f | Junio C Hamano | 21 May 2008, 21:27:59 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/ | 21 May 2008, 21:27:59 UTC |
| e77b0b5 | Jeff King | 19 May 2008, 20:09:06 UTC | git-am: fix typo in usage message Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:47:16 UTC |
| 74190d2 | Jeff King | 19 May 2008, 20:08:33 UTC | doc/git-daemon: s/uploadarchive/uploadarch/ The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:46:13 UTC |
| e4d594c | Jon Loeliger | 16 May 2008, 19:43:50 UTC | git-filter-branch: Clarify file removal example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2008, 20:13:24 UTC |
| a473445 | Junio C Hamano | 14 May 2008, 20:46:42 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Documentation/git-describe.txt: make description more readable | 14 May 2008, 20:46:42 UTC |
| b7893cd | Ian Hilt | 14 May 2008, 18:30:55 UTC | Documentation/git-describe.txt: make description more readable Signed-off-by: Ian Hilt <ian.hilt@gmail.com> Credit-to: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2008, 18:47:03 UTC |
| 3e08f5d | Junio C Hamano | 11 May 2008, 19:09:12 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: wt-status.h: declare global variables as extern builtin-commit.c: add -u as short name for --untracked-files git-repack: re-enable parsing of -n command line option | 11 May 2008, 19:09:12 UTC |
| 32efcd9 | Johannes Sixt | 09 May 2008, 08:05:27 UTC | wt-status.h: declare global variables as extern There are linkers out there that complain if a global non-static variable is defined multiple times. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:04:46 UTC |
| e164590 | Sitaram Chamarty | 09 May 2008, 17:12:55 UTC | builtin-commit.c: add -u as short name for --untracked-files This makes the C code consistent with the documentation and the old shell code. Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:04:20 UTC |
| 2b36b14 | A Large Angry SCM | 10 May 2008, 20:52:51 UTC | git-repack: re-enable parsing of -n command line option In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt, 2007-11-04), parsing of the '-n' command line option was accidentally lost when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds it back. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:03:58 UTC |
| 32a27b5 | Junio C Hamano | 09 May 2008, 03:12:44 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u | 09 May 2008, 03:12:44 UTC |
| 15ddb6f | Dustin Sallings | 08 May 2008, 18:28:07 UTC | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" Signed-off-by: Dustin Sallings <dustin@spy.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2008, 19:15:30 UTC |
| afd899e | Jeff King | 08 May 2008, 17:25:06 UTC | doc: clarify definition of "update" for git-add -u The "-u" option is described only in terms of "updating" files, which in turn is described only as "similar to what git commit -a does". Let's be a little more specific about what updating entails. Suggested by Geoffrey Irving. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2008, 19:09:42 UTC |
| 6233a52 | Junio C Hamano | 04 May 2008, 01:55:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: filter-branch: Documentation fix. | 04 May 2008, 01:55:33 UTC |
| 2788631 | Jeff King | 02 May 2008, 14:05:36 UTC | checkout: don't rfc2047-encode oneline on detached HEAD When calling pretty_print_commit, there is an implicit assumption that passing in a non-NULL "subject" variable for oneline or email formats means that the output is part of a subject and therefore "subject" to rfc2047 encoding. This is not the desired effect when reporting the movement of detached HEAD. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2008, 01:47:18 UTC |
| a174889 | Florian Ragwitz | 30 April 2008, 07:47:43 UTC | filter-branch: Documentation fix. It's --msg-filter, not --message-filter. Signed-off-by: Florian Ragwitz <rafl@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2008, 19:05:21 UTC |
| 2d8bed9 | Junio C Hamano | 30 April 2008, 18:42:05 UTC | fetch-pack: brown paper bag fix When I applied Linus's patch from the list by hand somehow I ended up reversing the logic by mistake. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 18:42:05 UTC |
| 30c0312 | Junio C Hamano | 30 April 2008, 05:55:07 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: cvsimport: always pass user data to "system" as a list fix reflog approxidate parsing bug | 30 April 2008, 05:55:07 UTC |
| b3bb5f7 | Jeff King | 30 April 2008, 04:36:14 UTC | cvsimport: always pass user data to "system" as a list This avoids invoking the shell. Not only is it faster, but it prevents the possibility of interpreting our arguments in the shell. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 05:45:27 UTC |
| 861f00e | Jeff King | 30 April 2008, 04:13:58 UTC | fix reflog approxidate parsing bug In get_sha1_basic, we parse a string like HEAD@{10 seconds ago}:path/to/file into its constituent ref, reflog date, and path components. We never actually munge the string itself, but instead keep offsets into the string with their associated lengths. When we call approxidate on the contents inside braces, however, we pass just a string without a length. This means that approxidate could sometimes look past the closing brace and (erroneously) interpret the rest of the string as part of the date. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 05:22:19 UTC |
| 7b7f39e | Alex Riesen | 28 April 2008, 20:23:35 UTC | Fix use after free() in builtin-fetch As reported by Dave Jones: Since master.kernel.org updated to latest, I noticed that I could crash git-fetch by doing this.. export KERNEL=/pub/scm/linux/kernel/git/ git fetch $KERNEL/torvalds/linux-2.6 master:linus (gdb) bt 0 0x000000349fd6d44b in free () from /lib64/libc.so.6 1 0x000000000048f4eb in transport_unlock_pack (transport=0x7ce530) at transport.c:811 2 0x000000349fd31b25 in exit () from /lib64/libc.so.6 3 0x00000000004043d8 in handle_internal_command (argc=3, argv=0x7fffea4449f0) at git.c:379 4 0x0000000000404547 in main (argc=3, argv=0x7fffea4449f0) at git.c:443 5 0x000000349fd1c784 in __libc_start_main () from /lib64/libc.so.6 6 0x0000000000403ef9 in ?? () 7 0x00007fffea4449d8 in ?? () 8 0x0000000000000000 in ?? () I then remembered, my .bashrc has this.. export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) which is handy for showing up such bugs. More info on this glibc feature is at http://udrepper.livejournal.com/11429.html Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2008, 06:57:47 UTC |
| 72269ad | Linus Torvalds | 28 April 2008, 23:27:49 UTC | fetch-pack: do not stop traversing an already parsed commit f3ec549 (fetch-pack: check parse_commit/object results, 2008-03-03) broke common ancestor computation by stopping traversal when it sees an already parsed commit. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 23:27:49 UTC |
| e42251a | Alex Riesen | 28 April 2008, 21:09:55 UTC | Use "=" instead of "==" in condition as it is more portable At least the dash from Ubuntu's /bin/sh says: test: 233: ==: unexpected operator Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 22:03:28 UTC |
| a2b26ac | Junio C Hamano | 23 April 2008, 17:53:47 UTC | clone: detect and fail on excess parameters "git clone [options] $src $dst excess-garbage" simply ignored excess-garbage without giving any diagnostic message. Fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:47:39 UTC |
| 5736a37 | Junio C Hamano | 28 April 2008, 04:47:38 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Remove 'header' from --signoff option description | 28 April 2008, 04:47:38 UTC |
| 362b0dd | Dan McGee | 27 April 2008, 00:43:20 UTC | Remove 'header' from --signoff option description Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:46:51 UTC |
| 1ce89cc | Jeff King | 22 April 2008, 11:11:13 UTC | remote: create fetch config lines with '+' Since git-remote always uses remote tracking branches, it should be safe to always force updates of those branches. I.e., we should generate fetch = +refs/heads/*:refs/remotes/$remote/* instead of fetch = refs/heads/*:refs/remotes/$remote/* This was the behavior of the perl version, which seems to have been lost in the C rewrite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:30:31 UTC |
| f8aae12 | Jeff King | 23 April 2008, 09:16:06 UTC | push: allow unqualified dest refspecs to DWIM Previously, a push like: git push remote src:dst would go through the following steps: 1. check for an unambiguous 'dst' on the remote; if it exists, then push to that ref 2. otherwise, check if 'dst' begins with 'refs/'; if it does, create a new ref 3. otherwise, complain because we don't know where in the refs hierarchy to put 'dst' However, in some cases, we can guess about the ref type of 'dst' based on the ref type of 'src'. Specifically, before complaining we now check: 2.5. if 'src' resolves to a ref starting with refs/heads or refs/tags, then prepend that to 'dst' So now this creates a new branch on the remote, whereas it previously failed with an error message: git push master:newbranch Note that, by design, we limit this DWIM behavior only to source refs which resolve exactly (including symrefs which resolve to existing refs). We still complain on a partial destination refspec if the source is a raw sha1, or a ref expression such as 'master~10'. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:13:24 UTC |
| 31c6390 | Junio C Hamano | 25 April 2008, 04:50:48 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects | 25 April 2008, 04:50:48 UTC |
| 3ffb58b | Jeff King | 24 April 2008, 01:28:36 UTC | doc/git-gc: add a note about what is collected It seems to be a FAQ that people try running git-gc, and then get puzzled about why the size of their .git directory didn't change. This note mentions the reasons why things might unexpectedly get kept. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 04:50:19 UTC |
| 3ef6a1f | Jeff King | 23 April 2008, 09:21:45 UTC | t5516: remove ambiguity test (1) This test tried to push into a remote with ambiguous refs in remotes/$x/master and remotes/$y/master. However, the remote never actually tells us about the refs/remotes hierarchy, so we don't even see this ambiguity. The test happened to pass because we were simply looking for failure, and the test fails for another reason: the dst refspec does not exist and does not begin with refs/, making it invalid. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:56:07 UTC |
| 837f3b7 | Matt Graham | 23 April 2008, 13:13:51 UTC | Linked glossary from cvs-migration page Coming from CVS, I found the git glossary vital to learning git and learning how terms in git correlate to the cvs terminology with which I am familiar. This patch links the glossary from the cvs-migration page so cvs users will be able to fine the glossary as soon as they start looking at git documents. Signed-off-by: Matt Graham <mdg149@gmail.com> Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:54:43 UTC |
| edae5f0 | Junio C Hamano | 23 April 2008, 16:47:17 UTC | write-tree: properly detect failure to write tree objects Tomasz Fortuna reported that "git commit" does not error out properly when it cannot write tree objects out. "git write-tree" shares the same issue, as the failure to notice the error is deep in the logic to write tree objects out recursively. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:02:44 UTC |
| d6958a1 | Junio C Hamano | 23 April 2008, 06:37:06 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory | 23 April 2008, 06:37:06 UTC |
| 491b1b1 | Sam Vilain | 21 April 2008, 03:31:24 UTC | Amend git-push refspec documentation These paragraphs are a little confusing. Also, make it clearer when you have to specify the full name for <dst> Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 06:01:48 UTC |
| 208641c | Dmitry Potapov | 14 April 2008, 12:17:31 UTC | git-gc --prune is deprecated 25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option deprecated and removed its description from the git-gc man page. This patch removes all references to this option from the rest of the Git documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:53:37 UTC |
| 4f7ec79 | Michael Weber | 18 April 2008, 13:12:04 UTC | svn-git: Use binmode for reading/writing binary rev maps Otherwise, there is a possible interaction with UTF-8 locales in combination with PERL_UNICODE, resulting in "inconsistent size: 40" or "read:"-type errors. See also: perldoc -f binmode <http://perldoc.perl.org/perl581delta.html#UTF-8-no-longer-default-under-UTF-8-locales> Signed-off-by: Michael Weber <michaelw@foldr.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:43:58 UTC |
| a6f47b2 | Miklos Vajna | 22 April 2008, 12:23:48 UTC | diff options documentation: refer to --diff-filter in --name-status git diff --name-status outputs letters, but the meaning of those letters is documented elsewhere. Add a note to make the manpage more intuitive. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:38 UTC |
| 34b5cd1 | Jeff King | 22 April 2008, 10:41:47 UTC | Don't force imap.host to be set when imap.tunnel is set The documentation for git-imap-send suggests a tunnel setting such as Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null" which works wonderfully and doesn't require a username, password or port setting. However, git-imap-send currently requires that the imap.host variable be set in the config even when it was unused. This patch changes imap-send to only require that the imap.host setting is set if imap.tunnel is not set. Otherwise, server.host is set to "tunnel" for reporting purposes. Acked-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:23 UTC |
| 2498a1a | Brandon Casey | 03 April 2008, 18:26:13 UTC | git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc Since git-gc now always calls prune, even with --auto, unreferenced objects may be removed by more operations than just git-gc. This is important for clones created using --shared or --reference. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:40:44 UTC |
| 9231f50 | Thomas Guyot-Sionnest | 22 April 2008, 10:07:47 UTC | git-svn bug with blank commits and author file When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch changes this behavior and allow using the author file with blanks authors. I came across this bug while importing from a cvs2svn repo where the initial revision (1) has a blank author. This doesn't break the behavior of bailing out when an unknown author is encountered. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:39:10 UTC |
| 75b7dfb | Ariel Badichi | 23 April 2008, 01:06:27 UTC | archive.c: format_subst - fixed bogus argument to memchr Also removed a superfluous test. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:23:16 UTC |
| 8b1f6de | Ariel Badichi | 23 April 2008, 01:05:29 UTC | copy.c: copy_fd - correctly report write errors Previously, the errno could have been lost due to an intervening close() call. This patch also contains minor cosmetic changes. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:21:08 UTC |
| 82881b3 | Matthew Ogilvie | 22 April 2008, 18:19:12 UTC | gitattributes: Fix subdirectory attributes specified from root directory Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:12:37 UTC |
| 71bd81a | Andy Parkins | 21 April 2008, 13:44:44 UTC | post-receive-email: fix accidental removal of a trailing space in signature line post-receive-email adds a signature to the end of emails in generate_email_footer(). The signature was separated from the main email body using the standard string "-- ". (see RFC 3676) a6080a0 (War on whitespace, 2007-06-07) removed the trailing whitespace from "-- ", leaving it as "--", which is not a correct signature separator. This patch restores the missing space, but does it in a way that will not set off the trailing whitespace alarms. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:36:56 UTC |
| 85d17a1 | martin f. krafft | 20 April 2008, 21:23:38 UTC | Escape project names before creating pathinfo URLs If a project name contains special URL characters like +, gitweb's links break in subtle ways. The solution is to pass the project name through esc_url() and using the return value. Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:55 UTC |
| bbd4c30 | martin f. krafft | 20 April 2008, 21:03:56 UTC | Escape project name in regexp The project name, when used in a regular expression, needs to be quoted properly, so that stuff like '++' in the project name does not cause Perl to barf. Related info: http://bugs.debian.org/476076 This is a bug in Perl's CGI.pm, but fixing that exposed a similar bug in gitweb.perl Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:11 UTC |
| f457413 | Teemu Likonen | 20 April 2008, 19:32:47 UTC | bash: Add completion for git diff --base --ours --theirs Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:52:15 UTC |
| 37152d8 | Gerrit Pape | 21 April 2008, 18:15:52 UTC | diff-options.txt: document the new "--dirstat" option This commit adds the documentation for the new option added by 7df7c01 (Add "--dirstat" for some directory statistics, 2008-02-12). Noticed by Clint Adams, reported through http://bugs.debian.org/476437 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:50:21 UTC |
| 66aaa2f | Junio C Hamano | 20 April 2008, 18:36:53 UTC | GIT 1.5.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2008, 18:36:53 UTC |
| 41a3e3a | Junio C Hamano | 20 April 2008, 06:01:51 UTC | Merge branch 'jc/maint-rebase-am' into maint * jc/maint-rebase-am: rebase: do not munge commit log message Conflicts: git-am.sh | 20 April 2008, 06:01:51 UTC |
| 5634cf2 | Jakub Narebski | 13 April 2008, 12:12:15 UTC | gitweb: Fix 'history' view for deleted files with history When asked for history of a file which is not present in given branch ("HEAD", i.e. current branch, or given by transient $hash_hase ('hb') parameter), but is present deeper in the history (meaning that "git rev-list --full-history $hash_base -- $file_name" is not empty), and there is no $hash ('h') parameter set for a file, gitweb would spew multiple of "Use of uninitialized value" warnings, and some links would be missing. This commit fixes this bug. This bug occurs in the rare cases when "git log -- <path>" is empty and "git log --full-history -- <path>" is not, or to be more exact in the cases when full-history starts later than given branch. It can happen if you are using handcrafted gitwb URL, or if you follow generic 'history' link or bookmark for a file which got deleted. Gitweb tried to get file type ('tree', or 'blob', or even 'commit') from the commit we start searching from (where the file was not present), and not among found commits. This was the cause of "Use of uninitialized value" warnings. This commit also add tests for such situation to t9500 test. While we are it, return HTTP error if there is _no_ history; it means that file or directory was not found (for given branch). Also error out if type of item could not be found: it should not happen now, but better be sure. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:10:38 UTC |
| f01f815 | Matthieu Moy | 13 April 2008, 13:38:21 UTC | Document that WebDAV doesn't need git on the server, and works over SSL I managed to set up a Git repository on a preconfigured WebDAV server, and using HTTPS, without installing Git on it or changing the server configuration. This works through a proxy too. This patch reflects this (it previously stated that Git was _necessary_ on the server, which isn't true). Also give a few hints to troubleshoting. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:09:24 UTC |
| 4c414e2 | Junio C Hamano | 19 April 2008, 05:07:00 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: am: POSIX portability fix | 19 April 2008, 05:07:00 UTC |
| 24b6177 | Jonas Fonseca | 13 April 2008, 09:56:54 UTC | git-remote: reject adding remotes with invalid names This can happen if the arguments to git-remote add is switched by the user, and git would only show an error if fetching was also requested. Fix it by using the refspec parsing engine to check if the requested name can be parsed as a remote before add it. Also cleanup so that the "remote.<name>.url" config name buffer is only initialized once. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:31:27 UTC |
| 29df238 | Junio C Hamano | 18 April 2008, 23:11:40 UTC | am: POSIX portability fix POSIX allows echo without flag to interpret specials such as \n, and we tried to make things portable by using printf instead where it matters. Recently added code to "git am" had unprotected "echo", which was caught by t4014 and Rémi Vanicat. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:11:40 UTC |
| d0ab520 | Junio C Hamano | 17 April 2008, 00:04:05 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: minor cleanup Clarify and fix English in "git-rm" documentation | 17 April 2008, 00:04:05 UTC |
| 11dc4e7 | Junio C Hamano | 16 April 2008, 23:46:26 UTC | git-am: minor cleanup This moves the assignment to FIRSTLINE down so that we do not have to have multiple copies. Suggested by Linus. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:46:26 UTC |
| 25dc720 | Jon Loeliger | 16 April 2008, 23:41:27 UTC | Clarify and fix English in "git-rm" documentation Do some verb-noun agreement changes. Clarify some file globbing cases. Fixed a wrong statement in an example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:45:23 UTC |
| 5e835ca | Junio C Hamano | 16 April 2008, 19:50:48 UTC | rebase: do not munge commit log message Traditionally git-rebase was implemented in terms of "format-patch" piped to "am -3", to strike balance between speed (because it avoids a rather expensive read-tree/merge-recursive machinery most of the time) and flexibility (the magic "-3" allows it to fall back to 3-way merge as necessary). However, this combination has one flaw when dealing with a nonstandard commit log message format that has more than one lines in the first paragraph. This teaches "git am --rebasing" to take advantage of the fact that the mbox message "git rebase" prepares for it records the original commit object name, to get the log message from the original commit object instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 19:50:48 UTC |
| 464509f | Junio C Hamano | 16 April 2008, 07:37:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-bisect: make "start", "good" and "skip" succeed or fail atomically git-am: cope better with an empty Subject: line Ignore leading empty lines while summarizing merges bisect: squelch "fatal: ref HEAD not a symref" misleading message builtin-apply: Show a more descriptive error on failure when opening a patch Clarify documentation of git-cvsserver, particularly in relation to git-shell | 16 April 2008, 07:37:33 UTC |
| d3e54c8 | Christian Couder | 14 April 2008, 03:41:45 UTC | git-bisect: make "start", "good" and "skip" succeed or fail atomically Before this patch, when "git bisect start", "git bisect good" or "git bisect skip" were called with many revisions, they could fail after having already marked some revisions as "good", "bad" or "skip". This could be especilally bad for "git bisect start" because as the file ".git/BISECT_NAMES" would not have been written, there would have been no attempt to clear the marked revisions on a "git bisect reset". That's because if there is no ".git/BISECT_NAMES" file, nothing is done to clean things up, as the bisect session is not supposed to have started. While at it, let's also create the ".git/BISECT_START" file, only after ".git/BISECT_NAMES" as been created. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 07:11:37 UTC |
| 2e6e3e8 | Linus Torvalds | 15 April 2008, 19:56:50 UTC | git-am: cope better with an empty Subject: line When the Subject: line is empty for whatever reason, git-am was fooled by it and left an empty line at the beginning of the resulting commit log message. This moves the logic around so that we do not keep $SUBJECT in a separate variable. Instead, $dotest/msg-clean, which used to be the log message body extracted from the message and then trailing whitespaces cleansed out, now contains the subject line followed by a blank line at the beginning for normal messages, and we use the first line from the file as the summary line throughout the program. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 07:11:04 UTC |
| 6a28518 | Linus Torvalds | 15 April 2008, 18:01:36 UTC | Ignore leading empty lines while summarizing merges "git log" and friends normally skip the initial empty lines when showing one-line summary of a commit, but merge summary didn't. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- builtin-fmt-merge-msg.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 06:53:26 UTC |
| 48949a1 | Christian Couder | 16 April 2008, 02:09:49 UTC | bisect: squelch "fatal: ref HEAD not a symref" misleading message To get the current HEAD when we start bisecting using for example "git bisect start", we first try "git symbolic-ref HEAD" to get a nice name, and if it fails, we fall back to "git rev-parse --verify HEAD". The problem is that when "git symbolic-ref HEAD" fails, it displays "fatal: ref HEAD not a symref", so it looks like "git bisect start" failed and does not accept detached HEAD, even if in fact it worked fine. This patch adds "-q" option to the "git symbolic-ref" call to get rid of the misleading error message. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:42:19 UTC |
| 1da1643 | Alberto Bertogli | 14 April 2008, 15:30:27 UTC | builtin-apply: Show a more descriptive error on failure when opening a patch When a patch can't be opened (it doesn't exist, there are permission problems, etc.) we get the usage text, which is not a proper indication of failure. Signed-off-by: Alberto Bertogli <albertito@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:42:08 UTC |
| 2c2d02a | Scott Collins | 15 April 2008, 21:44:43 UTC | Clarify documentation of git-cvsserver, particularly in relation to git-shell For SSH clients restricted to git-shell, CVS_SERVER does not have to be specified, because git-shell understands the default value of 'cvs' to mean git-cvsserver'. This makes it totally transparent to CVS users, but the instruction to set up CVS access for people with real shell access does not apply. Previous wording mentioning GIT_AUTHOR, GIT_COMMITTER variables was unclear that we really meant GIT_AUTHOR_(NAME|EMAIL), etc. Note that the .ssh/environment file is a good place to set these, and that the .bashrc is shell-specific. Add a bit of text to differentiate cvs -d (setting CVSROOT) from cvs co -d (setting the name of the newly checked out directory). Removed an extra 'Example:' string. Signed-off-by: Scott Collins <scc@ScottCollins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:41:54 UTC |
| 2b6f0b0 | Shawn Bohrer | 13 April 2008, 23:49:38 UTC | git clean: Add test to verify directories aren't removed with a prefix Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:58 UTC |
| f2d0df7 | Shawn Bohrer | 15 April 2008, 03:14:09 UTC | git clean: Don't automatically remove directories when run within subdirectory When git clean is run from a subdirectory it should follow the normal policy and only remove directories if they are passed in as a pathspec, or -d is specified. The fix is to send len which could be shorter than ent->len because we have stripped the trailing '/' that read_directory adds. Additionaly match_one() was modified to allow a name[] that is not NUL terminated. This allows us to check if the name matched the pathspec exactly instead of recursively. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:58 UTC |
| f669ac0 | Mark Levedahl | 15 April 2008, 02:48:06 UTC | git-submodule - possibly use branch name to describe a module This changes the search logic for describing a submodule from: - annotated tag - any tag - tag on a subsequent commit - commit id to - annotated tag - any tag - tag on a subsequent commit - local or remote branch - commit id The change is describing with respect to a branch before falling back to the commit id. By itself, git-submodule will maintain submodules as headless checkouts without ever making a local branch. In general, such heads can always be described relative to the remote branch regardless of existence of tags, and so provides a better fallback summary than just the commit id. This requires inserting an extra describe step as --contains is incompatible with --all, but the latter can be used with --always to fall back to a commit ID. Also, --contains implies --tags, so the latter is not needed. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:08 UTC |
| 02604e2 | Junio C Hamano | 13 April 2008, 01:57:08 UTC | t7401: squelch garbage output The script had an unconditional output done outside of test_expect_* construct, which leaked out and contaminated the output without -v. Squelch it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2008, 01:57:08 UTC |
| 51836e9 | Junio C Hamano | 13 April 2008, 01:34:39 UTC | Documentation/git-submodule: typofix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2008, 01:34:39 UTC |
| 60e3aba | Daniel Barkalow | 12 April 2008, 19:32:00 UTC | Fix config key miscount in url.*.insteadOf Also tighten test to require it to be correct. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:41:24 UTC |
| d6d96f8 | Junio C Hamano | 12 April 2008, 22:41:19 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better | 12 April 2008, 22:41:19 UTC |
| e809507 | Clifford Caoile | 12 April 2008, 09:50:20 UTC | Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) gitk creates and uses ~/.gitk Signed-off-by: Clifford Caoile <piyo@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:39:07 UTC |
| 55ef8a4 | Junio C Hamano | 12 April 2008, 22:38:20 UTC | Document -w option to shortlog Noticed by Fredrik Noring. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:38:20 UTC |
| a179a30 | Christian Couder | 12 April 2008, 09:17:36 UTC | bisect: report bad rev better The previous one overwrote the variable used to report the bad input when the input is actually bad, and we did not give a useful enough information. This corrects it. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:16:13 UTC |
| eed8183 | Junio C Hamano | 12 April 2008, 06:55:55 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable Fix section about backdating tags in the git-tag docs Document option --only of git commit Documentation/git-request-pull: Fixed a typo ("send" -> "end") | 12 April 2008, 06:55:55 UTC |
| e338907 | Christian Couder | 12 April 2008, 05:53:59 UTC | bisect: fix bad rev checking in "git bisect good" It seems that "git bisect good" and "git bisect skip" have never properly checked arguments that have been passed to them. As soon as one of them can be parsed as a SHA1, no error or warning would be given. This is because 'git rev-parse --revs-only --no-flags "$@"' always "exit 0" and outputs all the SHA1 it can found from parsing "$@". This patch fix this by using, for each "bisect good" argument, the same logic as for the "bisect bad" argument. While at it, this patch teaches "bisect bad" to give a meaningfull error message when it is passed more than one argument. Note that if "git bisect good" or "git bisect skip" is given some proper revs and then something that is not a proper rev, then the first proper revs will still have been marked as "good" or "skip". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 06:54:45 UTC |
| a710522 | Michele Ballabio | 10 April 2008, 20:06:52 UTC | revision.c: make --date-order overriddable Jan Engelhardt noticed that while --topo-order can be overridden by a subsequent --date-order, the reverse was not possible. That's because setup_revisions() failed to set revs->lifo properly. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 06:01:33 UTC |
| a68972c | Ping Yin | 10 April 2008, 14:45:29 UTC | git-submodule: Avoid 'fatal: cannot describe' message When "git submodule status" command tries to show the name of the submodule HEAD revision more descriptively, but the submodule repository lacked a suitable tag to do so, it leaked "fatal: cannot describe" message to the UI. Squelch it by using '--always'. Signed-off-by: Ping Yin <pkufranky@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:35:39 UTC |
| b6309ac | Pedro Melo | 10 April 2008, 16:05:21 UTC | Force the medium pretty format on calls to git log If a user has customized format.pretty in config, git-svn rebase fails with: Unable to determine upstream SVN information from working tree history because the command expects to read the commit log in the default format. This fixes the command to explicitly ask for the format it wants to read from. Signed-off-by: Pedro Melo <melo@simplicidade.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:35:35 UTC |
| 055b661 | Björn Steinbrink | 11 April 2008, 20:52:07 UTC | Fix section about backdating tags in the git-tag docs The tagger is equal to the committer, not the author, so GIT_COMMITTER_DATE is the right environment variable to use, not GIT_AUTHOR_DATE. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:34:05 UTC |
| d4ba07c | Johannes Sixt | 10 April 2008, 11:33:09 UTC | Document option --only of git commit Its documentation was removed by 6c96753 (Documentation/git-commit: rewrite to make it more end-user friendly, 2006-12-08), even though it is referenced from a few places, including builtin-commit.c (as part of the commentary in the commit message template). Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2008, 19:54:15 UTC |
| ca593f7 | Dirk Suesserott | 09 April 2008, 20:20:10 UTC | Documentation/git-request-pull: Fixed a typo ("send" -> "end") Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2008, 19:25:30 UTC |
| f59774a | Jeff King | 10 April 2008, 00:03:49 UTC | git-fetch: fix status output when not storing tracking ref There was code in update_local_ref for handling this case, but it never actually got called. It assumed that storing in FETCH_HEAD meant a blank peer_ref name, but we actually have a NULL peer_ref in this case, so we never even made it to the update_local_ref function. On top of that, the display formatting was different from all of the other cases, probably owing to the fact that nobody had ever actually seen the output. This patch harmonizes the output with the other cases and moves the detection of this case into store_updated_refs, where we can actually trigger it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:30:44 UTC |
| 179c94b | Junio C Hamano | 10 April 2008, 07:29:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: core-tutorial.txt: Fix showing the current behaviour. git-archive: ignore prefix when checking file attribute Fix documentation syntax of optional arguments in short options. | 10 April 2008, 07:29:33 UTC |
| abea85d | Carlos Rica | 10 April 2008, 00:08:23 UTC | core-tutorial.txt: Fix showing the current behaviour. The --root option from "git diff-tree" won't do nothing when is given to commands like git-whatchanged or git-log, because those always print the initial commit by default. This fixes the tutorial explaining the function of the log.showroot configuration variable. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:41 UTC |
| ac7fa27 | René Scharfe | 09 April 2008, 21:14:43 UTC | git-archive: ignore prefix when checking file attribute Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute export-subst when the option --prefix is given, too. When it checked if a file has the attribute turned on, git-archive would try to look up the full path -- including the prefix -- in .gitattributes. That's wrong, as the prefix doesn't need to have any relation to any existing directories, tracked or not. This patch makes git-archive ignore the prefix when looking up if value of the attribute export-subst for a file. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:38 UTC |
| 3f36cbb | Carlos Rica | 09 April 2008, 11:07:14 UTC | Fix documentation syntax of optional arguments in short options. When an argument for an option is optional, like in -n from git-tag, puting a space between the option and the argument is interpreted as a missing argument for the option plus an isolated argument. Documentation now reflects the need to write the parameter following the option -n, as in "git tag -nARG", for instance. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:31 UTC |
| 1d2375d | Junio C Hamano | 08 April 2008, 04:57:43 UTC | GIT 1.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2008, 04:57:43 UTC |
| fae09a8 | Junio C Hamano | 08 April 2008, 04:52:23 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix changing colors through Edit->Preferences | 08 April 2008, 04:52:23 UTC |
| f61cc48 | Eric Wong | 07 April 2008, 07:08:03 UTC | git-svn: fix following renamed paths when tracking a single path When using git-svn to follow only a single (empty) path per svn-remote (i.e. not using --stdlayout), following the history of a renamed path was broken in c586879cdfa4f8181a14e953a9152a4639eef333. This reverts the regression for the single (emtpy) path per svn-remote case. To avoid breaking the tests in a committed revision, this is an addendum to a patch originally submitted by Santhosh Kumar Mani <santhoshmani@gmail.com>: > git-svn: add test for renamed directory fetch > > This test tries to fetch a directory which had renames in the > history from a SVN repository. [ew: unneccesary dependency on the starting an HTTP server removed from Santhosh's original test.] Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 07:16:08 UTC |
| a1c0dca | Junio C Hamano | 07 April 2008, 03:04:29 UTC | Merge branch 'jc/maint-apply-match-beginning' * jc/maint-apply-match-beginning: Fix "git apply" to correctly enforce "match at the beginning" | 07 April 2008, 03:04:29 UTC |
| aba201c | Pascal Obry | 06 April 2008, 16:56:08 UTC | Add prefix oriented completions for diff and format-patch commands. Signed-off-by: Pascal Obry <pascal@obry.net> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 03:03:09 UTC |
