| 6c293d4 | Santi Béjar | 08 March 2008, 11:30:04 UTC | ident.c: reword error message when the user name cannot be determined The "config --global" suggested in the message is a valid one-shot fix, and hopefully one-shot across machines that NFS mounts the home directories. This knowledge can hopefully be reused when you are forced to use git on Windows, but the fix based on GECOS would not be applicable, so it is not such a useful hint to mention the exact reason why the name cannot be determined. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2008, 03:43:21 UTC |
| 0bb91d9 | John Goerzen | 08 March 2008, 22:04:05 UTC | Fix dcommit, rebase when rewriteRoot is in use When the rewriteRoot setting is used with git-svn, it causes the svn IDs added to commit messages to bear a different URL than is actually used to retrieve Subversion data. It is common for Subversion repositories to be available multiple ways: for instance, HTTP to the public, and svn+ssh to people with commit access. The need to switch URLs for access is fairly common as well -- perhaps someone was just given commit access. To switch URLs without having to rewrite history, one can use the old url as a rewriteRoot, and use the new one in the svn-remote url setting. This works well for svn fetching and general git commands. However, git-svn dcommit, rebase, and perhaps other commands do not work in this scenario. They scan the svn ID lines in commit messages and attempt to match them up with url lines in [svn-remote] sections in the git config. This patch allows them to match rewriteRoot options, if such options are present. Signed-off-by: John Goerzen <jgoerzen@complete.org> Acked-by: Eric Wong <normalperson@yhbt.net> | 09 March 2008, 03:20:06 UTC |
| 655e851 | Adeodato Simó | 07 March 2008, 20:22:17 UTC | Really make the LF after reset in fast-import optional cmd_from() ends with a call to read_next_command(), which is needed when using cmd_from() from commands where from is not the last element. With reset, however, "from" is the last command, after which the flow returns to the main loop, which calls read_next_command() again. Because of this, always set unread_command_buf in cmd_reset_branch(), even if cmd_from() was successful. Add a test case for this in t9300-fast-import.sh. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2008, 18:46:10 UTC |
| 972b9a8 | Junio C Hamano | 08 March 2008, 10:20:37 UTC | Merge branch 'mh/maint-http-proxy-fix' into maint * mh/maint-http-proxy-fix: Set proxy override with http_init() | 08 March 2008, 10:20:37 UTC |
| 1f1300b | Junio C Hamano | 08 March 2008, 10:20:30 UTC | Merge branch 'js/maint-daemon' into maint * js/maint-daemon: daemon: ensure that base-path is an existing directory daemon: send more error messages to the syslog | 08 March 2008, 10:20:30 UTC |
| 274d9d3 | Junio C Hamano | 08 March 2008, 10:13:52 UTC | Merge branch 'js/maint-cvsexport' into maint * js/maint-cvsexport: cvsexportcommit: be graceful when "cvs status" reorders the arguments Conflicts: t/t9200-git-cvsexportcommit.sh | 08 March 2008, 10:13:52 UTC |
| 925ca88 | Junio C Hamano | 08 March 2008, 10:11:37 UTC | Merge branch 'jc/maint-log-merge-left-right' into maint * jc/maint-log-merge-left-right: Fix "git log --merge --left-right" | 08 March 2008, 10:11:37 UTC |
| ca2c195 | Junio C Hamano | 08 March 2008, 10:11:32 UTC | Merge branch 'ew/maint-svn-cert-fileprovider' into maint * ew/maint-svn-cert-fileprovider: git-svn: Don't prompt for client cert password everytime. | 08 March 2008, 10:11:32 UTC |
| c8744d6 | Pierre Habouzit | 06 March 2008, 21:28:19 UTC | unquote_c_style: fix off-by-one. The optional endp parameter to unquote_c_style() was supposed to point at a location past the closing double quote, but it was going one beyond it. git-fast-import used this function heavily and the bug caused it to misparse the input stream, especially when parsing a rename command: R "filename that needs quoting" rename-target-name Because the function erroneously ate the whitespace after the closing dq, this triggered "Missing space after source" error when it shouldn't. Thanks to Adeodato Simò for having caught this. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2008, 21:31:30 UTC |
| c2116a1 | Junio C Hamano | 07 March 2008, 03:04:26 UTC | test-lib: fix TERM to dumb for test repeatability Dscho noticed that Term::ReadLine (used by send-email) colorized its output for his TERM settings, inside t9001 tests. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2008, 21:29:07 UTC |
| 79f43f3 | Uwe Kleine-König | 06 March 2008, 20:28:07 UTC | config.txt: refer to --upload-pack and --receive-pack instead of --exec The options --upload-pack (of git-fetch-pack) and --receive-pack (of git-push) do the same as --exec (for both commands). But the former options have the more descriptive name. Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2008, 21:29:07 UTC |
| 891e85a | Junio C Hamano | 06 March 2008, 08:18:23 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails | 06 March 2008, 08:18:23 UTC |
| 2162306 | Shawn O. Pearce | 28 February 2008, 00:29:34 UTC | git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails Mac OS X Tiger may have a msgfmt available but it doesn't understand how to implement --tcl. Falling back to po2msg.sh on such systems is a reasonable behavior. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 March 2008, 07:13:16 UTC |
| 52dce39 | Shawn O. Pearce | 04 March 2008, 06:00:36 UTC | Fix 'git remote show' regression on empty repository in 1.5.4 Back in 18f7c51c we switched git-ls-remote/git-peek-remote to use the transport backend, rather than do everything itself. As part of that switch we started to produce a non-zero exit status if no refs were received from the remote peer, which happens when the remote peer has no commits pushed to it yet. (E.g. "git --git-dir=foo.git init; git ls-remote foo.git") Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2008, 06:47:14 UTC |
| 81646ad | Matthieu Moy | 03 March 2008, 17:52:49 UTC | Fix incorrect wording in git-merge.txt. A merge is not necessarily with a remote branch, it can be with any commit. Thanks to Paolo Ciarrocchi for pointing out the problem, and to Nicolas Pitre for pointing out the fact that a merge is not necessarily with a branch head. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 21:40:15 UTC |
| e6d1f76 | Gerrit Pape | 03 March 2008, 09:22:03 UTC | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options git-merge used to use either the --squash,--no-squash, --no-ff,--ff, --no-commit,--commit option, whichever came last in the command line. This lead to some un-intuitive behavior, having git merge --no-commit --no-ff <branch> actually commit the merge. Now git-merge respects --no-commit together with --no-ff, as well as other combinations of the options. However, this broke a selftest in t/t7600-merge.sh which expected to have --no-ff completely override the --squash option, so that git merge --squash --no-ff <branch> fast-forwards, and makes a merge commit; combining --squash with --no-ff doesn't really make sense though, and is now refused by git-merge. The test is adapted to test --no-ff without the preceding --squash, and another test is added to make sure the --squash --no-ff combination is refused. The unexpected behavior was reported by John Goerzen through http://bing.sdebian.org/468568 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 21:38:30 UTC |
| f23d1f7 | Mike Hommey | 03 March 2008, 19:30:16 UTC | Fix random crashes in http_cleanup() For some reason, http_cleanup was running all active slots, which could lead in situations where a freed slot would be accessed in fill_active_slots. OTOH, we are cleaning up, which means the caller doesn't care about pending requests. Just forget about them instead or running them. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 21:36:44 UTC |
| d3df427 | Junio C Hamano | 03 March 2008, 05:49:28 UTC | Update draft release notes for 1.5.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 07:37:54 UTC |
| 0f2d447 | Jeff King | 03 March 2008, 06:30:56 UTC | revert: actually check for a dirty index The previous code mistakenly used wt_status_prepare to check whether the index had anything commitable in it; however, that function is just an init function, and will never report a dirty index. The correct way with wt_status_* would be to call wt_status_print with the output pointing to /dev/null or similar. However, that does extra work by both examining the working tree and spewing status information to nowhere. Instead, let's just implement the useful subset of wt_status_print as an "is_index_dirty" function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 07:33:59 UTC |
| 90d0ed9 | Junio C Hamano | 28 February 2008, 21:09:30 UTC | tests: introduce test_must_fail When we expect a git command to notice and signal errors, we carelessly wrote in our tests: test_expect_success 'reject bogus request' ' do something && do something else && ! git command ' but a non-zero exit could come from the "git command" segfaulting. A new helper function "tset_must_fail" is introduced and it is meant to be used to make sure the command gracefully fails (iow, dying and exiting with non zero status is counted as a failure to "gracefully fail"). The above example should be written as: test_expect_success 'reject bogus request' ' do something && do something else && test_must_fail git command ' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 07:15:06 UTC |
| fcbcfe7 | Ping Yin | 03 March 2008, 02:03:18 UTC | git-submodule: Fix typo 'url' which should be '$url' Fix typo in 'test -z "url"' when checking whether a submodule url is empty. "url" should be "$url". Signed-off-by: Ping Yin <pkufranky@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 05:25:45 UTC |
| 5c09f32 | Björn Steinbrink | 03 March 2008, 04:08:43 UTC | receive-pack: Initialize PATH to include exec-dir. 511707d (use only the $PATH for exec'ing git commands) made it a requirement to call setup_path() to include the git exec-dir in PATH before spawning any other git commands. git-receive-pack was not yet adapted to do this and therefore fails to spawn git-unpack-objects if that is not in the standard PATH. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2008, 04:58:19 UTC |
| 84989bd | Mike Ralphson | 29 February 2008, 17:00:38 UTC | Documentation cherry-pick: Fix cut-and-paste error Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2008, 05:22:22 UTC |
| a1eebfb | Rémi Vanicat | 29 February 2008, 18:28:19 UTC | git.el: find the git-status buffer whatever its name is git-status used the buffer name to find git-status buffers, and that can fail if the buffer has another name, for example when multiple working directories is tracked. Signed-off-by: Rémi Vanicat <vanicat@debian.org> Acked-by: Alexandre Julliard <julliard@winehq.org> Tested-by: Xavier Maillard <xma@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2008, 05:22:18 UTC |
| f1a8cc6 | Junio C Hamano | 01 March 2008, 05:19:43 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Paper bag fix info dialog when no files are staged at commit | 01 March 2008, 05:19:43 UTC |
| 9907721 | Gerrit Pape | 28 February 2008, 18:44:42 UTC | templates/Makefile: don't depend on local umask setting Don't take the local umask setting into account when installing the templates/* files and directories, running 'make install' with umask set to 077 resulted in template/* installed with permissions 700 and 600. The problem was discovered by Florian Zumbiehl, reported through http://bugs.debian.org/467518 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2008, 21:36:50 UTC |
| a6f13cc | Daniel Barkalow | 28 February 2008, 17:24:42 UTC | Correct name of diff_flush() in API documentation Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2008, 21:35:09 UTC |
| b75bb1d | Junio C Hamano | 28 February 2008, 07:37:39 UTC | Start preparing for 1.5.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2008, 07:37:39 UTC |
| 094fbbf | Shawn O. Pearce | 28 February 2008, 06:28:45 UTC | git-gui: Paper bag fix info dialog when no files are staged at commit If the user tries to commit their changes without actually staging anything we used to display an informational dialog suggesting they first stage those changes, then retry the commit feature. Unfortunately I broke this in aba15f7 ("Ensure error dialogs always appear over all other windows") and failed to fix it in the paper bag fix that came one day after it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 February 2008, 06:28:45 UTC |
| e82447b | Junio C Hamano | 27 February 2008, 07:18:38 UTC | Fix "git log --merge --left-right" The command did not reject the combination of these options, but did not show left/right markers. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 23:42:05 UTC |
| 9fc6440 | Mike Hommey | 27 February 2008, 20:35:50 UTC | Set proxy override with http_init() In transport.c, proxy setting (the one from the remote conf) was set through curl_easy_setopt() call, while http.c already does the same with the http.proxy setting. We now just use this infrastructure instead, and make http_init() now take the struct remote as argument so that it can take the http_proxy setting from there, and any other property that would be added later. At the same time, we make get_http_walker() take a struct remote argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl(). We leave out http-fetch and http-push, which don't use remotes for the moment, purposefully. Signed-off-by: Mike Hommey <mh@glandium.org> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 23:37:57 UTC |
| 2063207 | Johannes Sixt | 26 February 2008, 12:00:55 UTC | daemon: ensure that base-path is an existing directory Any request to the daemon would fail if base-path (if specified) is not a directory. We now check for this condition early. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 22:47:36 UTC |
| 22665bb | Johannes Sixt | 25 February 2008, 13:25:20 UTC | daemon: send more error messages to the syslog There were a number of die() calls before the syslog was opened; hence, these error messages would have been sent to /dev/null in detached mode. Now we install the daemon-specific die routine before any error message is generated so that these messages go to the syslog. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 22:47:36 UTC |
| 0f497e7 | Carl Worth | 24 February 2008, 01:14:17 UTC | Eliminate confusing "won't bisect on seeked tree" failure This error message is very confusing---it doesn't tell the user anything about how to fix the situation. And the actual fix for the situation ("git bisect reset") does a checkout of a potentially random branch, (compared to what the user wants to be on for the bisect she is starting). The simplest way to eliminate the confusion is to just make "git bisect start" do the cleanup itself. There's no significant loss of safety here since we already have a general safety in the form of the reflog. Note: We preserve the warning for any cogito users. We do this by switching from .git/head-name to .git/BISECT_START for the extra state, (which is a more descriptive name anyway). Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 21:26:30 UTC |
| 7a0a34c | Brandon Casey | 22 February 2008, 18:47:08 UTC | builtin-reflog.c: don't install new reflog on write failure When expiring reflog entries, a new temporary log is written which contains only the entries to retain. After it is written, it is renamed to replace the existing reflog. Currently, we check that writing of the new log is successful and print a message on failure, but the original reflog is still replaced with the new reflog even on failure. This patch causes the original reflog to be retained if we fail when writing the new reflog. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 21:26:24 UTC |
| 6ecbc85 | Jay Soffian | 22 February 2008, 00:16:04 UTC | send-email: fix In-Reply-To regression Fix a regression introduced by 1ca3d6e (send-email: squelch warning due to comparing undefined $_ to "") where if the user was prompted for an initial In-Reply-To and didn't provide one, messages would be sent out with an invalid In-Reply-To of "<>" Also add test cases for the regression and the fix. A small modification was needed to allow send-email to take its replies from stdin if the environment variable GIT_SEND_EMAIL_NOTTY is set. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 21:26:14 UTC |
| 47e83e3 | Sebastian Noack | 25 February 2008, 14:56:28 UTC | git-svn: Don't prompt for client cert password everytime. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 20:01:33 UTC |
| 12f0a5e | Johan Herland | 11 February 2008, 23:43:41 UTC | Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR When using the '-w $cvsdir' option to cvsexportcommit, it will chdir into $cvsdir before executing several other git commands. If $GIT_DIR is set to a relative path (e.g. '.'), the git commands executed by cvsexportcommit will naturally fail. Therefore, ensure that $GIT_DIR is absolute before the chdir to $cvsdir. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 19:35:09 UTC |
| 9057f0a | Johan Herland | 13 February 2008, 03:11:22 UTC | Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR The testcase verifies that 'git cvsexportcommit' functions correctly when the '-w' option is used, and GIT_DIR is set to a relative path (e.g. '.'). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 19:35:05 UTC |
| 0460fb4 | Jonathan del Strother | 27 February 2008, 12:50:22 UTC | Prompt to continue when editing during rebase --interactive On hitting an edit point in an interactive rebase, git should prompt the user to run "git rebase --continue" Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 19:23:22 UTC |
| a50a5c8 | Miklos Vajna | 27 February 2008, 13:13:00 UTC | Documentation/git svn log: add a note about timezones. git svn log mimics the timezone converting behaviour of svn log, but this was undocumented. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 19:19:55 UTC |
| 28b01f4 | Junio C Hamano | 27 February 2008, 19:09:44 UTC | Merge branch 'js/maint-http-push' into maint * js/maint-http-push: http-push: avoid a needless goto http-push: do not get confused by submodules http-push: avoid invalid memory accesses | 27 February 2008, 19:09:44 UTC |
| 2ac8af1 | Daniel Barkalow | 26 February 2008, 22:15:31 UTC | Don't use GIT_CONFIG in t5505-remote For some reason, t5505-remote was setting GIT_CONFIG to .git/config and exporting it. This should have been no-op, as test framework did the same for a long time anyway. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2008, 08:22:39 UTC |
| 81fa145 | Bryan Donlan | 25 February 2008, 22:40:19 UTC | Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2008, 06:20:08 UTC |
| 695ed47 | Steven Drake | 26 February 2008, 00:45:53 UTC | timezone_names[]: fixed the tz offset for New Zealand. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2008, 05:56:10 UTC |
| 41e86a3 | Caio Marcelo de Oliveira Filho | 26 February 2008, 02:14:31 UTC | filter-branch documentation: non-zero exit status in command abort the filter Since commit 8c1ce0f46b85d40f215084eed7313896300082df filter-branch fails when a <command> has a non-zero exit status. This commit makes it clear in the documentation and also fixes the parent-filter example, that was incorrectly returning non-zero when the commit being tested wasn't the one to be rewritten. Signed-off-by: Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2008, 05:43:37 UTC |
| e103343 | Jay Soffian | 26 February 2008, 04:07:39 UTC | rev-parse: fix potential bus error with --parseopt option spec handling A non-empty line containing no spaces should be treated by --parseopt as an option group header, but was causing a bus error. Also added a test script for rev-parse --parseopt. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2008, 05:40:12 UTC |
| 1468bd4 | Daniel Barkalow | 25 February 2008, 19:24:48 UTC | Use a single implementation and API for copy_file() Originally by Kristian Hï¿œgsberg; I fixed the conversion of rerere, which had a different API. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2008, 21:06:49 UTC |
| ed10d9a | Miklos Vajna | 25 February 2008, 14:43:53 UTC | Documentation/git-filter-branch: add a new msg-filter example There were no example on how to edit commit messages, so add an msg-filter example. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2008, 21:05:25 UTC |
| ce4a7bf | Shawn O. Pearce | 25 February 2008, 03:57:29 UTC | Correct fast-export file mode strings to match fast-import standard The fast-import file format does not expect leading '0' in front of a file mode; that is we want '100644' and '0100644'. Thanks to Ian Clatworthy of the Bazaar project for noticing the difference in output/input. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2008, 04:09:54 UTC |
| 8c87dc7 | Shawn O. Pearce | 24 February 2008, 08:07:19 UTC | Protect peel_ref fallback case from NULL parse_object result If the SHA-1 we are requesting the object for does not exist in the object database we get a NULL back. Accessing the type from that is not likely to succeed on any system. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2008, 08:52:55 UTC |
| 6c0f869 | Shawn O. Pearce | 24 February 2008, 05:38:04 UTC | Ensure 'make dist' compiles git-archive.exe on Cygwin On Cygwin we have to use git-archive.exe as the target, otherwise running 'make dist' does not compile git-archive in the current directory. That may cause 'make dist' to fail on a clean source tree that has never been built before. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2008, 08:51:01 UTC |
| 31e0b2c | Junio C Hamano | 23 February 2008, 19:31:04 UTC | GIT 1.5.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2008, 19:31:04 UTC |
| e98d6df | Junio C Hamano | 23 February 2008, 19:23:59 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Focus insertion point at end of strings in repository chooser git-gui: Avoid hardcoded Windows paths in Cygwin package files git-gui: Default TCL_PATH to same location as TCLTK_PATH git-gui: Paper bag fix error dialogs opening over the main window git-gui: Ensure error dialogs always appear over all other windows git-gui: relax "dirty" version detection git-gui: support Git Gui.app under OS X 10.5 | 23 February 2008, 19:23:59 UTC |
| 9ea0980 | Jeff King | 22 February 2008, 19:47:27 UTC | hash: fix lookup_hash semantics We were returning the _address of_ the stored item (or NULL) instead of the item itself. While this sort of indirection is useful for insertion (since you can lookup and then modify), it is unnecessary for read-only lookup. Since the hash code splits these functions between the internal lookup_hash_entry function and the public lookup_hash function, it makes sense for the latter to provide what users of the library expect. The result of this was that the index caching returned bogus results on lookup. We unfortunately didn't catch this because we were returning a "struct cache_entry **" as a "void *", and accidentally assigning it to a "struct cache_entry *". As it happens, this actually _worked_ most of the time, because the entries were defined as: struct cache_entry { struct cache_entry *next; ... }; meaning that interpreting a "struct cache_entry **" as a "struct cache_entry *" would yield an entry where all fields were totally bogus _except_ for the next pointer, which pointed to the actual cache entry. When walking the list, we would look at the bogus "name" field, which was unlikely to match our lookup, and then proceed to the "real" entry. The reading of bogus data was silently ignored most of the time, but could cause a segfault for some data (which seems to be more common on OS X). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2008, 21:39:20 UTC |
| 3baee1f | Shawn O. Pearce | 11 February 2008, 05:53:52 UTC | git-gui: Focus insertion point at end of strings in repository chooser When selecting a local working directory for a new repository or a location to clone an existing repository into we now set the insert point at the end of the selected path, allowing the user to type in any additional parts of the path if they so desire. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:39:36 UTC |
| df4ec4c | Shawn O. Pearce | 22 February 2008, 00:27:46 UTC | git-gui: Avoid hardcoded Windows paths in Cygwin package files When we are being built by the Cygwin package maintainers we need to embed the POSIX path to our library files and not the Windows path. Embedding the Windows path means all end-users who install our Cygwin package would be required to install Cygwin at the same Windows path as the package maintainer had Cygwin installed to. This requirement is simply not user-friendly and may be infeasible for a large number of our users. We now try to auto-detect if the Tcl/Tk binary we will use at runtime is capable of translating POSIX paths into Windows paths the same way that cygpath does the translations. If the Tcl/Tk binary gives us the same results then it understands the Cygwin path translation process and should be able to read our library files from a POSIX path name. If it does not give us the same answer as cygpath then the Tcl/Tk binary might actually be a native Win32 build (one that is not linked against Cygwin) and thus requires the native Windows path to our library files. We can assume this is not a Cygwin package as the Cygwin maintainers do not currently ship a pure Win32 build of Tcl/Tk. Reported on the git mailing list by Jurko Gospodnetić. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:38:32 UTC |
| 651fbba | Shawn O. Pearce | 22 February 2008, 00:17:27 UTC | git-gui: Default TCL_PATH to same location as TCLTK_PATH Most users set TCLTK_PATH to tell git-gui where to find wish, but they fail to set TCL_PATH to the same Tcl installation. We use the non-GUI tclsh during builds so headless systems are still able to create an index file and create message files without GNU msgfmt. So it matters to us that we find a working TCL_PATH at build time. If TCL_PATH hasn't been set yet we can take a better guess about what tclsh executable to use by replacing 'wish' in the executable path with 'tclsh'. We only do this replacement on the filename part of the path, just in case the string "wish" appears in the directory paths. Most of the time the tclsh will be installed alongside wish so this replacement is a sensible and safe default. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:44 UTC |
| 85ec3e7 | Shawn O. Pearce | 21 February 2008, 17:22:08 UTC | git-gui: Paper bag fix error dialogs opening over the main window If the main window is the only toplevel we have open then we don't have a valid grab right now, so we need to assume the best toplevel to use for the parent is ".". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:23 UTC |
| aba15f7 | Shawn O. Pearce | 21 February 2008, 04:37:07 UTC | git-gui: Ensure error dialogs always appear over all other windows If we are opening an error dialog we want it to appear above all of the other windows, even those that we may have opened with a grab to make the window modal. Failure to do so may allow an error dialog to open up (and grab focus!) under an existing toplevel, making the user think git-gui has frozen up and is unresponsive, as they cannot get to the dialog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2008, 04:39:32 UTC |
| 0ca15e7 | Pekka Kaitaniemi | 20 February 2008, 22:29:39 UTC | Clarified the meaning of git-add -u in the documentation The git-add documentation did not state clearly that the -u switch updates only the tracked files that are in the current directory and its subdirectories. Signed-off-by: Pekka Kaitaniemi <kaitanie@cc.helsinki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2008, 00:08:48 UTC |
| 5274ba6 | Gerrit Pape | 20 February 2008, 15:10:17 UTC | git-clone.sh: properly configure remote even if remote's head is dangling When cloning a remote repository which's HEAD refers to a nonexistent ref, git-clone cloned all existing refs, but failed to write the configuration for 'remote'. Now it detects the dangling remote HEAD, refuses to checkout any local branch since HEAD refers to nowhere, but properly writes the configuration for 'remote', so that subsequent 'git fetch's don't fail. The problem was reported by Daniel Jacobowitz through http://bugs.debian.org/466581 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 19:31:17 UTC |
| fbd538c | Miklos Vajna | 20 February 2008, 11:31:35 UTC | Documentation/git-stash: document options for git stash list Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 19:23:58 UTC |
| 1ca3d6e | Jay Soffian | 20 February 2008, 05:55:07 UTC | send-email: squelch warning due to comparing undefined $_ to "" The check to see if initial_reply_to is defined was also comparing $_ to "" for a reason I cannot ascertain (looking at the commit which made the change didn't provide enlightenment), but if $_ is undefined, perl generates a warning. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 10:47:54 UTC |
| fef3a7c | Johannes Schindelin | 18 February 2008, 17:55:22 UTC | cvsexportcommit: be graceful when "cvs status" reorders the arguments In my use cases, "cvs status" sometimes reordered the passed filenames, which often led to a misdetection of a dirty state (when it was in reality a clean state). I finally tracked it down to two filenames having the same basename. So no longer trust the order of the results blindly, but actually check the file name. Since "cvs status" only returns the basename (and the complete path on the server which is useless for our purposes), run "cvs status" several times with lists consisting of files with unique (chomped) basenames. Be a bit clever about new files: these are reported as "no file <blabla>", so in order to discern it from existing files, prepend "no file " to the basename. In other words, one call to "cvs status" will not ask for two files "blabla" (which does not yet exist) and "no file blabla" (which exists). This patch makes cvsexportcommit slightly slower, when the list of changed files has non-unique basenames, but at least it is accurate now. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 06:44:20 UTC |
| 7c33d3a | Kristian Høgsberg | 18 February 2008, 23:11:21 UTC | Rename git-core rpm to just git and rename the meta-pacakge to git-all. This fixes my favorite annoyance with the git rpm packaging: don't pull in tla when I say yum install git! You wouldn't expect yum install gcc to pull in gcc-gfortran, right? With this change, and blanket 'yum update' will automatically pull in the new 'git' package and push out the old 'git-core', and if the old 'git' package was installed 'git-all' will be pulled in instead. A couple of things do break though: 'yum update git-core', because yum behaves differently when given a specific package name - it doesn't follow obsoletes. Instead, 'yum install git' will pull in the new git rpm, which will then push out the old 'git-core'. Similarly, to get the newest version of the meta package, 'yum install git-all' will install git-all, which then pushes out the old 'git' meta package. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 06:17:22 UTC |
| 066a526 | Jeff King | 19 February 2008, 16:26:45 UTC | push: document the status output The output was meant to be a balance of self-explanatory and terse. In case we have erred too far on the terse side, it doesn't hurt to explain in more detail what each line means. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:46:15 UTC |
| 68d06c5 | Jeff King | 19 February 2008, 16:25:22 UTC | Documentation/push: clarify matching refspec behavior The previous text was correct, but it was easy to miss the fact that we are talking about "matching" refs. That is, the text can be parsed as "we push the union of the sets of remote and local heads" and not "we push the intersection of the sets of remote and local heads". (The former actually doesn't make sense if you think about it, since we don't even _have_ some of those heads). A careful reading would reveal the correct meaning, but it makes sense to be as explicit as possible in documentation. We also explicitly use and introduce the term "matching"; this is a term discussed on the list, and it seems useful to for users to be able to refer to this behavior by name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:46:10 UTC |
| 2b8130c | Jeff King | 19 February 2008, 16:25:01 UTC | push: indicate partialness of error message The existing message indicates that an error occured during push, but it is unclear whether _any_ refs were actually pushed (even though the status table above shows which were pushed successfully and which were not, the message "failed to push" implies a total failure). By indicating that "some refs" failed, we hopefully indicate to the user that the table above contains the details. We could also put in an explicit "see above for details" message, but it seemed to clutter the output quite a bit (both on a line of its own, or at the end of the error line, which inevitably wraps). This could also be made more fancy if the transport mechanism passed back more details on how many refs succeeded and failed: error: failed to push %d out of %d refs to '%s' Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:44:47 UTC |
| 2c2a378 | Wincent Colaiuta | 18 February 2008, 08:36:33 UTC | git-gui: relax "dirty" version detection "git gui" would complain at launch if the local version of Git was "1.5.4.2.dirty". Loosen the regular expression to look for either "-dirty" or ".dirty", thus eliminating spurious warnings. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 February 2008, 01:50:29 UTC |
| e5fc9a0 | Junio C Hamano | 17 February 2008, 06:44:31 UTC | GIT 1.5.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2008, 08:20:38 UTC |
| 965053b | Pieter de Bie | 16 February 2008, 16:48:46 UTC | Documentation/git-reset: Add an example of resetting selected paths Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:57:05 UTC |
| ceb4cac | Pieter de Bie | 16 February 2008, 16:48:45 UTC | Documentation/git-reset: don't mention --mixed for selected-paths reset The option is accepted, but that is the only form selected-paths variant of the reset command takes, so there is no point mentioning it. And while we're at it, use the dashless git call. Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:56:24 UTC |
| 3983caa | Junio C Hamano | 16 February 2008, 18:38:12 UTC | Documentation/git-reset: Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:51:46 UTC |
| 959ba67 | Jeff King | 14 February 2008, 17:18:23 UTC | commit: discard index after setting up partial commit There may still be some entries from the original index that should be discarded before we show the status. In particular, if a file was added in the index but not included in the partial commit, it would still show up in the status listing as staged for commit. Ultimately the correct fix is to keep the two states in separate index_state variables. Then we can avoid having to reload the cache from the temporary file altogether, and just point wt_status_print at the correct index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 08:12:56 UTC |
| 1fe32cb | Junio C Hamano | 16 February 2008, 07:57:26 UTC | filter-branch: handle filenames that need quoting The command used a very old fashioned construct to extract filenames out of diff-index and ended up corrupting the output. We can simply use --name-only and pipe into --stdin mode of update-index. It's been like that for the past 2 years or so since a94d994 (update-index: work with c-quoted name). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:57:26 UTC |
| 7fea9c5 | Johannes Schindelin | 14 February 2008, 23:26:12 UTC | http-push: avoid a needless goto There was a goto, and while it is not half as harmful as some people believe, it was unnecessary here. So remove it for readability. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:21:57 UTC |
| 1bbeb4c | Johannes Schindelin | 14 February 2008, 23:32:32 UTC | http-push: do not get confused by submodules When encountering submodules in a tree, http-push should not try sending the respective object. Instead, it should ignore it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:21:56 UTC |
| add8e8c | Johannes Schindelin | 14 February 2008, 23:25:33 UTC | http-push: avoid invalid memory accesses Before objects are sent, the respective ref is locked. However, without this patch, the lock is lifted before the last object for that ref was sent. As a consequence, the lock data was accessed after the lock structure was free()d. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:21:56 UTC |
| 0ef617f | Junio C Hamano | 16 February 2008, 04:30:05 UTC | diff: Fix miscounting of --check output c1795bb (Unify whitespace checking) incorrectly made the checking function return without incrementing the line numbers when there is no whitespace problem is found on a '+' line. This resurrects the earlier behaviour. Noticed and reported by Jay Soffian. The test script was stolen from Jay's independent fix. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:06:57 UTC |
| 13bf1a9 | Stelian Pop | 15 February 2008, 21:20:44 UTC | hg-to-git: fix parent analysis Fix a bug in the hg-to-git convertor introduced by commit 1bc7c13af9f936aa80893100120b542338a10bf4: when searching the changeset parents, 'hg log' returns an extra space at the end of the line, which confuses the .split(' ') based tokenizer: Traceback (most recent call last): File "hg-to-git.py", line 123, in <module> hgchildren[mparent] += ( str(cset), ) KeyError: '' Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:01:49 UTC |
| 87f1b88 | Jay Soffian | 15 February 2008, 21:53:36 UTC | mailinfo: feed only one line to handle_filter() for QP input The function is intended to be fed one logical line at a time to inspect, but a QP encoded raw input line can have more than one lines, just like BASE64 encoded one. Quoting LF as =0A may be unusual but RFC2045 allows it. The issue was noticed and fixed by Jay Soffian. JC added a test to protect the fix from regressing later. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 06:16:34 UTC |
| b20a60d | Christian Couder | 16 February 2008, 05:02:17 UTC | diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver" Also use "git_config_string" to simplify code where "cmd" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:54 UTC |
| dfb068b | Christian Couder | 16 February 2008, 05:01:59 UTC | Add "const" qualifier to "char *excludes_file". Also use "git_config_string" to simplify "config.c" code where "excludes_file" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:54 UTC |
| ee9601e | Christian Couder | 16 February 2008, 05:01:41 UTC | Add "const" qualifier to "char *editor_program". Also use "git_config_string" to simplify "config.c" code where "editor_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| 872da32 | Christian Couder | 16 February 2008, 05:01:11 UTC | Add "const" qualifier to "char *pager_program". Also use "git_config_string" to simplify "config.c" code where "pager_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| ea5105a | Christian Couder | 16 February 2008, 05:00:24 UTC | config: add 'git_config_string' to refactor string config variables. In many places we just check if a value from the config file is not NULL, then we duplicate it and return 0. This patch introduces the new 'git_config_string' function to do that. This function is also used to refactor some code in 'config.c'. Refactoring other files is left for other patches. Also not all the code in "config.c" is refactored, because the function takes a "const char **" as its first parameter, but in many places a "char *" is used instead of a "const char *". (And C does not allow using a "char **" instead of a "const char **" without a warning.) Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| 2c77821 | Christian Couder | 16 February 2008, 04:59:53 UTC | diff.c: remove useless check for value != NULL It is not necessary to check if value != NULL before calling 'parse_lldiff_command' as there is already a check inside this function. By the way this patch also improves the existing check inside 'parse_lldiff_command' by using: return config_error_nonbool(var); instead of: return error("%s: lacks value", var); Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| e8b32e0 | Shawn O. Pearce | 14 February 2008, 06:34:34 UTC | fast-import: check return value from unpack_entry() If the tree object we have asked for is deltafied in the packfile and the delta did not apply correctly or was not able to be decompressed from the packfile then we can get back NULL instead of the tree data. This is (part of) the reason why read_sha1_file() can return NULL, so we need to also handle it the same way. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 04:11:51 UTC |
| df93e33 | Daniel Barkalow | 15 February 2008, 19:14:18 UTC | Validate nicknames of remote branches to prohibit confusing ones The original problem was that the parsers for configuration files were getting confused by seeing as nicknames remotes that involved directory-changing characters. In particular, the branches config file for ".." was particularly mystifying on platforms that can open directories and read odd data from them. The validation function was written by Junio Hamano (with a typo corrected). Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 22:23:22 UTC |
| 8ca496e | Christian Couder | 14 February 2008, 05:50:00 UTC | diff.c: replace a 'strdup' with 'xstrdup'. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 22:11:28 UTC |
| 5880711 | Junio C Hamano | 15 February 2008, 17:37:54 UTC | diff.c: fixup garding of config parser from value=NULL Christian Couder noticed that there still were a handcrafted error() call that we should have converted to config_error_nonbool() where parse_lldiff_command() parses the configuration file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 17:37:54 UTC |
| d8e8757 | Christian Couder | 07 February 2008, 05:23:46 UTC | config: add test cases for empty value and no value config variables. The tests in 't1300-repo-config.sh' did not check what happens when an empty value like the following is used in the config file: [emptyvalue] variable = Also it was not checked that a variable with no value like the following: [novalue] variable gives a boolean "true" value, while an ampty value gives a boolean "false" value. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 22:23:32 UTC |
| 9386ecb | Gerrit Pape | 07 February 2008, 09:36:10 UTC | cvsimport: have default merge regex also match beginning of commit message The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 22:22:54 UTC |
| 8466887 | Miklos Vajna | 12 February 2008, 00:12:57 UTC | git clone -s documentation: force a new paragraph for the NOTE It should be loud and clear. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 22:15:44 UTC |
| ff58b9a | Jeff King | 12 February 2008, 05:45:18 UTC | status: suggest "git rm --cached" to unstage for initial commit It makes no sense to suggest "git reset HEAD" since we have no HEAD commit. This actually used to work but regressed in f26a0012. wt_status_print_cached_header was updated to take the whole wt_status struct rather than just the reference field. Previously the various code paths were sometimes sending in s->reference and sometimes sending in NULL, making the decision on whether this was an initial commit before we even got to this function. Now we must check the initial flag here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 21:54:58 UTC |
| 077b725 | Junio C Hamano | 13 February 2008, 21:13:21 UTC | Protect get_author_ident_from_commit() from filenames in work tree We used to use "cat-file commit $commit" to extract the original author information from existing commit, but an earlier commit 5ac2715 (Consistent message encoding while reusing log from an existing commit) changed it to use "git show -s $commit". If you have a file in your work tree that can be interpreted as a valid object name (e.g. "HEAD"), this conversion will not work. Disambiguate by marking the end of revision parameter on the comand line with an explicit "--" to fix this. This breakage is most visible with rebase when a file called "HEAD" exists in the worktree. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 21:43:02 UTC |
| 04b3305 | Johannes Sixt | 12 February 2008, 11:28:01 UTC | upload-pack: Initialize the exec-path. Since git-upload-pack has to spawn git-pack-objects, it has to make sure that the latter can be found in the PATH. Without this patch an attempt to clone or pull via ssh from a server fails if the git tools are not in the standard PATH on the server even though git clone or git pull were invoked with --upload-pack=/path/to/git-upload-pack. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 20:04:01 UTC |
| f454cdc | Johannes Schindelin | 12 February 2008, 19:50:57 UTC | bisect: use verbatim commit subject in the bisect log Due to a typo, the commit subject was shell expanded in the bisect log. That is, if you had some shell pattern in the commit subject, bisect would happily put all matching file names into the log. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 20:03:49 UTC |
| 8608b33 | Sergei Organov | 13 February 2008, 14:31:17 UTC | git-cvsimport.txt: fix '-M' description. Fix '-M' description. Old one reads as if the user can somehow "see" the default regex when using -M along with -m. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 19:08:41 UTC |
