| ec82874 | Junio C Hamano | 15 December 2010, 19:27:41 UTC | Git 1.6.5.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:27:41 UTC |
| 88fcc52 | Junio C Hamano | 15 December 2010, 19:19:11 UTC | Git 1.6.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:19:11 UTC |
| 3017ed6 | Jakub Narebski | 14 December 2010, 23:34:01 UTC | gitweb: Introduce esc_attr to escape attributes of HTML elements It is needed only to escape attributes of handcrafted HTML elements, and not those generated using CGI.pm subroutines / methods for HTML generation. While at it, add esc_url and esc_html where needed, and prefer to use CGI.pm HTML generating methods than handcrafted HTML code. Most of those are probably unnecessary (could be exploited only by person with write access to gitweb config, or at least access to the repository). This fixes CVE-2010-3906 Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it> Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:16:31 UTC |
| d8e3ac7 | Stephen Boyd | 23 July 2010, 16:31:27 UTC | request-pull.txt: Document -p option Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 04:52:19 UTC |
| a07b10c | Junio C Hamano | 26 July 2010, 04:51:58 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:51:58 UTC |
| 1b0b962 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2010, 17:33:47 UTC |
| 2998138 | Uwe Kleine-König | 06 July 2010, 14:46:05 UTC | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option The ?: operator has a lower priority than |, so the implicit associativity made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and PARSE_OPT_SHELL_EVAL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 18:11:50 UTC |
| 8024d59 | Michal Sojka | 04 March 2010, 12:08:28 UTC | Remove extra '-' from git-am(1) Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2010, 06:02:44 UTC |
| 003c6ab | Jeff King | 16 February 2010, 07:03:16 UTC | dwim_ref: fix dangling symref warning If we encounter a symref that is dangling, in most cases we will warn about it. The one exception is a dangling HEAD, as that indicates a branch yet to be born. However, the check in dwim_ref was not quite right. If we were fed something like "HEAD^0" we would try to resolve "HEAD", see that it is dangling, and then check whether the _original_ string we got was "HEAD" (which it wasn't in this case). And that makes no sense; the dangling thing we found was not "HEAD^0" but rather "HEAD". Fixing this squelches a scary warning from "submodule summary HEAD" (and consequently "git status" with status.submodulesummary set) in an empty repo, as the submodule script calls "git rev-parse -q --verify HEAD^0". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 17:03:58 UTC |
| 460ccd0 | Thomas Rast | 15 February 2010, 16:05:46 UTC | stash pop: remove 'apply' options during 'drop' invocation The 'git stash pop' option parsing used to remove the first argument in --index mode. At the time this was implemented, this first argument was always --index. However, since the invention of the -q option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can cause an internal invocation of git stash drop --index by running git stash pop -q --index which then of course fails because drop doesn't know --index. To handle this, instead let 'git stash apply' decide what the future argument to 'drop' should be. Warning: this means that 'git stash apply' must parse all options that 'drop' can take, and deal with them in the same way. This is currently true for its only option -q. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 05:46:27 UTC |
| 8324b97 | Larry D'Anna | 16 February 2010, 04:10:45 UTC | diff: make sure --output=/bad/path is caught The return value from fopen wasn't being checked. Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 05:46:01 UTC |
| 33f0ea4 | Junio C Hamano | 09 February 2010, 18:06:33 UTC | t8003: check exit code of command and error message separately Shell reports exit status only from the most downstream command in a pipeline. In these tests, we want to make sure that the command fails in a controlled way, and produces a correct error message. This issue was known by Jay who submitted the patch, and also was pointed out by Hannes during the review process, but I forgot to fix it up before applying. Sorry about that. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 21:42:29 UTC |
| 92f9e27 | Jay Soffian | 09 February 2010, 03:48:13 UTC | blame: prevent a segv when -L given start > EOF blame would segv if given -L <lineno> with <lineno> past the end of the file. While we're fixing the bug, add test cases for an invalid <start> when called as -L <start>,<end> or -L<start>. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2010, 05:52:44 UTC |
| 153559a | Junio C Hamano | 01 February 2010, 08:06:11 UTC | Merge branch 'sb/maint-octopus' into maint-1.6.5 * sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow | 01 February 2010, 08:06:11 UTC |
| 4b68365 | Junio C Hamano | 01 February 2010, 08:04:12 UTC | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5 * bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files | 01 February 2010, 08:04:12 UTC |
| 65d41d4 | Jeff King | 29 January 2010, 10:28:44 UTC | fix memcpy of overlapping area Caught by valgrind in t5500, but it is pretty obvious from reading the code that this is shifting elements of an array to the left, which needs memmove. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2010, 17:52:21 UTC |
| 35eabd1 | Junio C Hamano | 20 January 2010, 20:44:59 UTC | Git 1.6.5.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2010, 20:44:59 UTC |
| 806e5c8 | Junio C Hamano | 20 January 2010, 20:22:58 UTC | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 * jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE | 20 January 2010, 20:22:58 UTC |
| 91d23be | Junio C Hamano | 20 January 2010, 20:22:54 UTC | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5 * tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state | 20 January 2010, 20:22:54 UTC |
| e770655 | Junio C Hamano | 20 January 2010, 20:17:24 UTC | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5 * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type | 20 January 2010, 20:17:24 UTC |
| 27132ca | Junio C Hamano | 20 January 2010, 20:16:46 UTC | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5 * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file | 20 January 2010, 20:16:46 UTC |
| 03c6e97 | Junio C Hamano | 19 January 2010, 05:37:12 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Fix mis-backport of t7002 base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails | 19 January 2010, 05:37:12 UTC |
| 814035c | Junio C Hamano | 19 January 2010, 05:37:06 UTC | Merge branch 'maint-1.6.3' into maint-1.6.4 * maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c | 19 January 2010, 05:37:06 UTC |
| 011c181 | Junio C Hamano | 19 January 2010, 05:29:47 UTC | Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c | 19 January 2010, 05:29:47 UTC |
| 18d97f5 | Junio C Hamano | 19 January 2010, 05:18:41 UTC | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 * commit 'v1.6.4.4-8-g8de6518': Fix mis-backport of t7002 | 19 January 2010, 05:18:41 UTC |
| 8de6518 | Junio C Hamano | 19 January 2010, 05:14:41 UTC | Fix mis-backport of t7002 The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot more than the same test script in 1.6.4 series, and the output didn't match the expected result. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 05:14:49 UTC |
| 34f3999 | Jim Meyering | 18 January 2010, 21:55:07 UTC | grep: NUL terminate input from a file Internally "git grep" runs regexec(3) that expects its input string to be NUL terminated. When searching inside blob data, read_sha1_file() automatically gives such a buffer, but builtin-grep.c forgot to put the NUL at the end, even though it allocated enough space for it. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 01:01:29 UTC |
| 8db751a | Dmitry Potapov | 14 January 2010, 04:44:19 UTC | fast-import: tag may point to any object type If you tried to export the official git repository, and then to import it back then git-fast-import would die complaining that "Mark :1 not a commit". Accordingly to a generated crash file, Mark 1 is not a commit but a blob, which is pointed by junio-gpg-pub tag. Because git-tag allows to create such tags, git-fast-import should import them. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2010, 05:51:06 UTC |
| c503467 | Junio C Hamano | 10 January 2010, 08:49:47 UTC | Merge branch 'maint-1.6.1' into maint-1.6.2 * maint-1.6.1: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c | 10 January 2010, 08:49:47 UTC |
| 96aa7ad | Junio C Hamano | 10 January 2010, 08:48:47 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". | 10 January 2010, 08:48:47 UTC |
| 0606c36 | Andreas Gruenbacher | 08 January 2010, 13:40:00 UTC | base85: Make the code more obvious instead of explaining the non-obvious Here is another cleanup ... Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:47 UTC |
| b0bec51 | Andreas Gruenbacher | 08 January 2010, 16:22:18 UTC | base85: encode_85() does not use the decode table Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:37 UTC |
| 75b7e16 | Andreas Gruenbacher | 08 January 2010, 13:39:58 UTC | base85 debug code: Fix length byte calculation Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:27 UTC |
| 47b7012 | Björn Gustavsson | 07 December 2009, 18:35:42 UTC | git-rm doc: Describe how to sync index & work tree Newcomers to git that want to remove from the index only the files that have disappeared from the working tree will probably look for a way to do that in the documentation for 'git rm'. Therefore, describe how that can be done (even though it involves other commands than 'git rm'). Based on a suggestion by Junio, but re-arranged and rewritten to better fit into the style of command reference. While at it, change a single occurrence of "work tree" to "working tree" for consistency. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 23:37:33 UTC |
| 64da3ae | Junio C Hamano | 07 January 2010, 07:51:47 UTC | checkout -m: do not try to fall back to --merge from an unborn branch If switching from an unborn branch (= empty tree) to a valid commit failed without -m, it would fail with -m option as well. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 07:51:47 UTC |
| 6e8f993 | Matthieu Moy | 30 December 2009, 14:45:31 UTC | branch: die explicitly why when calling "git branch [-a|-r] branchname". The -a and -r options used to be silently ignored in such a command. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:52:05 UTC |
| cf6e7ba | Thomas Rast | 31 December 2009, 11:48:41 UTC | bash completion: factor submodules into dirty state In the implementation of GIT_PS1_SHOWDIRTYSTATE in 738a94a (bash: offer to show (un)staged changes, 2009-02-03), I cut&pasted the git-diff invocations from dirty-worktree checks elsewhere, carrying along the --ignore-submodules option. As pointed out by Kevin Ballard, this doesn't really make sense: to the _user_, a changed submodule counts towards uncommitted changes. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 20:40:34 UTC |
| 70d7099 | Jeff King | 30 December 2009, 09:02:53 UTC | textconv: stop leaking file descriptors We read the output from textconv helpers over a pipe, but we never actually closed our end of the pipe after using it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 09:22:27 UTC |
| cd0f0f6 | Jeff King | 30 December 2009, 08:47:03 UTC | reset: unbreak hard resets with GIT_WORK_TREE Commit 952dfc6 tried to tighten the safety valves for doing a "reset --hard" in a bare repository or outside the work tree, but accidentally broke the case for GIT_WORK_TREE. This patch unbreaks it. Most git commands which need a work tree simply use NEED_WORK_TREE in git.c to die before they get to their cmd_* function. Reset, however, only needs a work tree in some cases, and so must handle the work tree itself. The error that 952dfc6 made was to simply forbid certain operations if the work tree was not set up; instead, we need to do the same thing that NEED_WORK_TREE does, which is to call setup_work_tree(). We no longer have to worry about dying in the non-worktree case, as setup_work_tree handles that for us. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 09:05:21 UTC |
| 799fdb4 | Junio C Hamano | 30 December 2009, 04:16:34 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: commit: --cleanup is a message option t7102: make the test fail if one of its check fails | 30 December 2009, 04:16:34 UTC |
| e97ca7f | Greg Price | 29 December 2009, 21:54:49 UTC | commit: --cleanup is a message option In the usage message for "git commit", the --cleanup option appeared at the end, as one of the "contents options": usage: git commit [options] [--] <filepattern>... ... Commit message options ... Commit contents options ... --allow-empty ok to record an empty change --cleanup <default> how to strip spaces and #comments from message This is confusing, in part because it makes it ambiguous whether --allow-empty, just above, refers to an empty diff or an empty message. Move --cleanup into the 'message options' group. Also add a pair of comments to prevent similar oversights in the future. Signed-off-by: Greg Price <price@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 04:15:41 UTC |
| c985ddf | Andreas Schwab | 29 December 2009, 19:09:15 UTC | git count-objects: handle packs bigger than 4G Use off_t to count sizes of packs and objects to avoid overflow after 4Gb. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 03:51:37 UTC |
| 153bb83 | Nguyễn Thái Ngọc Duy | 29 December 2009, 08:13:18 UTC | t7102: make the test fail if one of its check fails Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 03:39:27 UTC |
| c8cba79 | David Reiss | 22 December 2009, 18:51:41 UTC | Prevent git blame from segfaulting on a missing author name The human-readable author and committer name can be missing from commits imported from foreign SCM interfaces. Make sure we parse the "author" and "committer" line a bit more leniently and avoid segfaulting by assuming the name always exists. Signed-off-by: David Reiss <dreiss@facebook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2009, 19:51:17 UTC |
| e49ca97 | Björn Gustavsson | 19 December 2009, 12:04:03 UTC | rebase -i: abort cleanly if the editor fails to launch If the user's configured editor is emacsclient, the editor will fail to launch if emacs is not running and the git command that tried to lanuch the editor will abort. For most commands, all you have to do is to start emacs and repeat the command. The "git rebase -i" command, however, aborts without cleaning the "$GIT_DIR/rebase-merge" directory if it fails to launch the editor, so you'll need to do "git rebase --abort" before repeating the rebase command. Change "git rebase -i" to terminate using "die_abort" (instead of with "die") if the initial launch of the editor fails. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2009, 07:20:05 UTC |
| afab0fe | Stephen Boyd | 18 December 2009, 00:05:29 UTC | technical-docs: document hash API Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2009, 05:54:50 UTC |
| 63b7694 | Stephen Boyd | 18 December 2009, 00:05:28 UTC | api-strbuf.txt: fix typos and document launch_editor() Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2009, 05:54:28 UTC |
| 527b9d7 | Junio C Hamano | 16 December 2009, 18:23:54 UTC | Git 1.6.5.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:25 UTC |
| b3100fd | Junio C Hamano | 16 December 2009, 18:50:09 UTC | worktree: don't segfault with an absolute pathspec without a work tree If a command is run with an absolute path as a pathspec inside a bare repository, e.g. "rev-list HEAD -- /home", the code tried to run strlen() on NULL, which is the result of get_git_work_tree(), and segfaulted. It should just fail instead. Currently the function returns NULL even inside .git/ in a repository with a work tree, but that is a separate issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:25 UTC |
| 8b8e862 | Jeff King | 12 December 2009, 12:25:24 UTC | ignore unknown color configuration When parsing the config file, if there is a value that is syntactically correct but unused, we generally ignore it. This lets non-core porcelains store arbitrary information in the config file, and it means that configuration files can be shared between new and old versions of git (the old versions might simply ignore certain configuration). The one exception to this is color configuration; if we encounter a color.{diff,branch,status}.$slot variable, we die if it is not one of the recognized slots (presumably as a safety valve for user misconfiguration). This behavior has existed since 801235c (diff --color: use $GIT_DIR/config, 2006-06-24), but hasn't yet caused a problem. No porcelain has wanted to store extra colors, and we once a color area (like color.diff) has been introduced, we've never changed the set of color slots. However, that changed recently with the addition of color.diff.func. Now a user with color.diff.func in their config can no longer freely switch between v1.6.6 and older versions; the old versions will complain about the existence of the variable. This patch loosens the check to match the rest of git-config; unknown color slots are simply ignored. This doesn't fix this particular problem, as the older version (without this patch) is the problem, but it at least prevents it from happening again in the future. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:16 UTC |
| 06500a0 | Johannes Sixt | 15 December 2009, 07:57:18 UTC | help.autocorrect: do not run a command if the command given is junk If a given command is not found, then help.c tries to guess which one the user could have meant. If help.autocorrect is 0 or unset, then a list of suggestions is given as long as the dissimilarity between the given command and the candidates is not excessively high. But if help.autocorrect was non-zero (i.e., a delay after which the command is run automatically), the latter restriction on dissimilarity was not obeyed. In my case, this happened: $ git ..daab02 WARNING: You called a Git command named '..daab02', which does not exist. Continuing under the assumption that you meant 'read-tree' in 4.0 seconds automatically... The patch reuses the similarity limit that is also applied when the list of suggested commands is printed. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 00:21:51 UTC |
| d79f5d1 | Nanako Shiraishi | 15 December 2009, 03:11:10 UTC | Illustrate "filter" attribute with an example The example was taken from aa4ed402c9721170fde2e9e43c3825562070e65e (Add 'filter' attribute and external filter driver definition). Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2009, 06:04:30 UTC |
| f08aa01 | Stephen Boyd | 12 December 2009, 00:38:59 UTC | octopus: remove dead code MSG, PARENT, and CNT are never used, just assigned to. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:40:24 UTC |
| 85bf49f | Stephen Boyd | 12 December 2009, 00:38:58 UTC | octopus: reenable fast-forward merges The fast-forward logic is never being triggered because $common and $MRC are never equivalent. $common is initialized to a commit id by merge-base and MRC is initialized to HEAD. Fix this by initializing $MRC to the commit id for HEAD so that its possible for $MRC and $common to be equal. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:40:24 UTC |
| 8133450 | Stephen Boyd | 12 December 2009, 00:38:57 UTC | octopus: make merge process simpler to follow Its not very easy to understand what heads are being merged given the current output of an octopus merge. Fix this by replacing the sha1 with the (usually) better description in GITHEAD_<SHA1>. Suggested-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:17:46 UTC |
| 9861b64 | Junio C Hamano | 10 December 2009, 23:42:30 UTC | Git 1.6.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:42:30 UTC |
| 782a000 | Junio C Hamano | 10 December 2009, 23:27:51 UTC | Fix archive format with -- on the command line Giving --format from the command line, or using output file extention to DWIM the output format, with a pathspec that is disambiguated with an explicit double-dash on the command line, e.g. git archive -o file --format=zip HEAD -- path git archive -o file.zip HEAD -- path didn't work correctly. This was because the code reordered (when one was given) or added (when the format was inferred) a --format argument at the end, effectively making it to "archive HEAD -- path --format=zip", i.e. an extra pathspec that is unlikely to match anything. The command line argument list should always be "options, revs and then paths", and we should set a good example by inserting the --format at the beginning instead. Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:29:05 UTC |
| 1456b04 | Junio C Hamano | 10 December 2009, 20:17:11 UTC | Remove post-upload-hook This hook runs after "git fetch" in the repository the objects are fetched from as the user who fetched, and has security implications. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 20:21:40 UTC |
| 5c30b8f | Junio C Hamano | 09 December 2009, 06:42:23 UTC | Merge branch 'mm/maint-merge-ff-error-message-fix' into maint * mm/maint-merge-ff-error-message-fix: builtin-merge: show user-friendly error messages for fast-forward too. merge-recursive: make the error-message generation an extern function Conflicts: merge-recursive.c | 09 December 2009, 06:42:23 UTC |
| 389e0ba | Junio C Hamano | 09 December 2009, 06:39:20 UTC | Merge branch 'jn/maint-pull-rebase-error-message' into maint * jn/maint-pull-rebase-error-message: pull: clarify advice for the unconfigured error case | 09 December 2009, 06:39:20 UTC |
| a876433 | Junio C Hamano | 09 December 2009, 06:37:50 UTC | Merge branch 'jk/maint-add-p-delete-fix' into maint * jk/maint-add-p-delete-fix: add-interactive: fix deletion of non-empty files | 09 December 2009, 06:37:50 UTC |
| 8947fdd | Jeff King | 08 December 2009, 07:49:35 UTC | add-interactive: fix deletion of non-empty files Commit 24ab81a fixed the deletion of empty files, but broke deletion of non-empty files. The approach it took was to factor out the "deleted" line from the patch header into its own hunk, the same way we do for mode changes. However, unlike mode changes, we only showed the special "delete this file" hunk if there were no other hunks. Otherwise, the user would annoyingly be presented with _two_ hunks: one for deleting the file and one for deleting the content. This meant that in the non-empty case, we forgot about the deleted line entirely, and we submitted a bogus patch to git-apply (with "/dev/null" as the destination file, but not marked as a deletion). Instead, this patch combines the file deletion hunk and the content deletion hunk (if there is one) into a single deletion hunk which is either staged or not. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2009, 07:52:46 UTC |
| 441947f | Björn Gustavsson | 07 December 2009, 18:26:57 UTC | git-add/rm doc: Consistently back-quote Consistently back-quote commands, options and file names. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2009, 21:02:35 UTC |
| 968d707 | Björn Gustavsson | 07 December 2009, 08:20:09 UTC | Documentation: 'git add -A' can remove files The current documentation fails to mention that 'git add -A/--all' can remove files as well as add them, and it also does not say anything about filepatterns (whether they are allowed, mandatory, or optional). It is also not clear what the similarities and differences to the -u option are. Update the intro paragraph (as suggested by Junio, with some minor edits) to make it clear that 'git add' is able to delete and to also cover the -p option. Reword the description of -u to make it clearer (based on Björn Steinbrink's suggestion). Simplify the description of -A by saying "Like -u" and then describe the differences (based on the suggestions by Björn Steinbrink and Junio). Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2009, 08:27:57 UTC |
| aa03131 | Junio C Hamano | 05 December 2009, 19:08:35 UTC | Git 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 19:08:35 UTC |
| 77cd6ab | Linus Torvalds | 04 December 2009, 20:07:47 UTC | Fix diff -B/--dirstat miscounting of newly added contents What used to happen is that diffcore_count_changes() simply ignored any hashes in the destination that didn't match hashes in the source. EXCEPT if the source hash didn't exist at all, in which case it would count _one_ destination hash that happened to have the "next" hash value. As a consequence, newly added material was often undercounted, making output from --dirstat and "complete rewrite" detection used by -B unrelialble. This changes it so that: - whenever it bypasses a destination hash (because it doesn't match a source), it counts the bytes associated with that as "literal added" - at the end (once we have used up all the source hashes), we do the same thing with the remaining destination hashes. - when hashes do match, and we use the difference in counts as a value, we also use up that destination hash entry (the 'd++'). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:54:17 UTC |
| 952dfc6 | Jeff King | 04 December 2009, 11:11:58 UTC | reset: improve worktree safety valves The existing code checked to make sure we were not in a bare repository when doing a hard reset. However, we should take this one step further, and make sure we are in a worktree. Otherwise, we can end up munging files inside of '.git'. Furthermore, we should do the same check for --merge resets, which have the same properties. Actually, a merge reset of HEAD^ would already complain, since further down in the code we want a worktree. However, it is nicer to check up-front; then we are sure we cover all cases ("git reset --merge" would run, even though it wasn't doing anything) and we can give a more specific message. Add tests to t7103 to cover these cases and some missing ones. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:28:20 UTC |
| 50d9bbb | Todd Zullinger | 04 December 2009, 17:53:21 UTC | Documentation: Avoid use of xmlto --stringparam The --stringparam option is not available on older xmlto versions. Instead, set man.base.url.for.relative.links via a .xsl file. Older docbook versions will ignore this without causing grief to users of older xmlto versions. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:03:49 UTC |
| 165ca62 | René Scharfe | 04 December 2009, 23:11:01 UTC | archive: clarify description of path parameter Mention that path parameters are based on the current working directory. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> -- Documentation/git-archive.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2009, 23:16:40 UTC |
| e5f5917 | Jeff King | 04 December 2009, 10:35:57 UTC | rerere: don't segfault on failure to open rr-cache The rr-cache directory should always exist if we are doing garbage collection (earlier code paths check this explicitly), but we may not necessarily succeed in opening it (for example, due to permissions problems). In that case, we should print an error message rather than simply segfaulting. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2009, 17:11:58 UTC |
| adf9628 | Junio C Hamano | 03 December 2009, 22:07:32 UTC | Prepare for 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 22:07:32 UTC |
| dda8f4b | Junio C Hamano | 03 December 2009, 21:56:50 UTC | Merge branch 'uk/maint-shortlog-encoding' into maint * uk/maint-shortlog-encoding: t4201: use ISO8859-1 rather than ISO-8859-1 shortlog: respect commit encoding | 03 December 2009, 21:56:50 UTC |
| c8b1d76 | Junio C Hamano | 03 December 2009, 21:54:25 UTC | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint * fc/maint-format-patch-pathspec-dashes: format-patch: add test for parsing of "--" format-patch: fix parsing of "--" on the command line | 03 December 2009, 21:54:25 UTC |
| 99292c6 | Junio C Hamano | 03 December 2009, 21:54:11 UTC | Merge branch 'ap/maint-merge-strategy-list-fix' into maint * ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly. | 03 December 2009, 21:54:11 UTC |
| 78b77c4 | Junio C Hamano | 03 December 2009, 21:54:03 UTC | Merge branch 'jc/maint-am-keep' into maint * jc/maint-am-keep: Remove dead code from "git am" | 03 December 2009, 21:54:03 UTC |
| 957f5db | Junio C Hamano | 03 December 2009, 21:53:58 UTC | Merge branch 'rs/work-around-grep-opt-insanity' into maint * rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() | 03 December 2009, 21:53:58 UTC |
| af742b9 | Junio C Hamano | 03 December 2009, 21:53:54 UTC | Merge branch 'rj/maint-cygwin-count-objects' into maint * rj/maint-cygwin-count-objects: git-count-objects: Fix a disk-space under-estimate on Cygwin | 03 December 2009, 21:53:54 UTC |
| 24807f9 | Junio C Hamano | 03 December 2009, 21:52:54 UTC | Merge branch 'mm/maint-hint-failed-merge' into maint * mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten. | 03 December 2009, 21:52:54 UTC |
| d718c19 | Junio C Hamano | 03 December 2009, 21:52:31 UTC | Merge branch 'th/maint-remote-update-help-string' into maint * th/maint-remote-update-help-string: Update 'git remote update' usage string to match man page. | 03 December 2009, 21:52:31 UTC |
| 3920917 | Junio C Hamano | 03 December 2009, 21:52:22 UTC | Merge branch 'rj/maint-t9700' into maint * rj/maint-t9700: t9700-perl-git.sh: Fix a test failure on Cygwin | 03 December 2009, 21:52:22 UTC |
| 2936824 | Junio C Hamano | 03 December 2009, 21:52:16 UTC | Merge branch 'ls/maint-mailinfo-no-inbody' into maint * ls/maint-mailinfo-no-inbody: git am/mailinfo: Don't look at in-body headers when rebasing | 03 December 2009, 21:52:16 UTC |
| 3c362d4 | Junio C Hamano | 03 December 2009, 21:52:11 UTC | Merge branch 'mo/maint-crlf-doc' into maint * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute | 03 December 2009, 21:52:11 UTC |
| e24bd95 | Junio C Hamano | 03 December 2009, 21:51:53 UTC | Merge branch 'th/remote-usage' into maint * th/remote-usage: git remote: Separate usage strings for subcommands | 03 December 2009, 21:51:53 UTC |
| 9c1506a | Junio C Hamano | 03 December 2009, 21:51:41 UTC | Merge branch 'pb/maint-use-custom-perl' into maint * pb/maint-use-custom-perl: Make sure $PERL_PATH is defined when the test suite is run. | 03 December 2009, 21:51:41 UTC |
| d1dfc01 | Junio C Hamano | 03 December 2009, 21:51:36 UTC | Merge branch 'mm/config-pathname-tilde-expand' into maint * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template | 03 December 2009, 21:51:36 UTC |
| f2c0ca4 | Junio C Hamano | 03 December 2009, 21:51:26 UTC | Merge branch 'bc/grep-i-F' into maint * bc/grep-i-F: grep: Allow case insensitive search of fixed-strings | 03 December 2009, 21:51:26 UTC |
| 9a6b9cd | Junio C Hamano | 03 December 2009, 21:51:21 UTC | Merge branch 'jk/maint-break-rename-reduce-memory' into maint * jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go | 03 December 2009, 21:51:21 UTC |
| c206224 | Junio C Hamano | 03 December 2009, 21:51:16 UTC | Merge branch 'rj/maint-simplify-cygwin-makefile' into maint * rj/maint-simplify-cygwin-makefile: Makefile: merge two Cygwin configuration sections into one | 03 December 2009, 21:51:16 UTC |
| dc733ef | Junio C Hamano | 03 December 2009, 21:50:41 UTC | Merge branch 'rg/doc-workflow' into maint * rg/doc-workflow: Add branch management for releases to gitworkflows | 03 December 2009, 21:50:41 UTC |
| ef3a4fd | Junio C Hamano | 03 December 2009, 21:50:24 UTC | Merge branch 'np/maint-sideband-favor-status' into maint * np/maint-sideband-favor-status: give priority to progress messages | 03 December 2009, 21:50:24 UTC |
| 59a0a0b | Junio C Hamano | 03 December 2009, 19:12:32 UTC | Documentation: xmlto 0.0.18 does not know --stringparam Newer DocBook stylesheets want man.base.url.for.relative.links parameter set when formatting manpages with external references to turn them into full URLs, and leave a helpful "you should set this parameter" message in the output. Earlier we added the MAN_BASE_URL make variable to specify the value for it. When MAN_BASE_URL is not given, it ought to be safe to set the parameter to empty; it would result in an empty leading path for older stylesheets that ignore the parameter, and newer ones would produce the same "relative URL" without the message. Unfortunately, older xmlto (at least version 0.0.18 released in early 2004 that comes with RHEL/CentOS 5) does not understand the --stringparam command line option, so we cannot add the parameter definition unconditionally to the command line. Work it around by passing the parameter only when set. If you do not have a suitable URL prefix, you can pass a quoted empty string to it, like so: $ make MAN_BASE_URL='""' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 19:23:03 UTC |
| 3994e8a | Brandon Casey | 03 December 2009, 17:52:45 UTC | t4201: use ISO8859-1 rather than ISO-8859-1 Some ancient platforms do not have an extensive list of alternate names for character encodings. For example, Solaris 7 and IRIX 6.5 do not know that ISO-8859-1 is the same as ISO8859-1. Modern platforms do know this, so use the older name. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 18:06:13 UTC |
| 995fc2f | Jan Krüger | 27 November 2009, 14:17:05 UTC | pull: clarify advice for the unconfigured error case When pull --rebase fails because it cannot find what branch to merge against, the error message implies we are trying to merge. Say "rebase against" instead of "merge with" to avoid confusion. The configuration suggested to remedy the situation uses a confusing syntax, with variables specified in the dotted form accepted by 'git config' but separated from their values by the '=' delimiter used by config files. Since the user will have to edit this output anyway, it is more helpful to provide a config file snippet to paste into an editor and modify. Signed-off-by: Jan Krüger <jk@jk.gs> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 18:04:27 UTC |
| eefe19f | Junio C Hamano | 03 December 2009, 08:08:16 UTC | Git 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 08:08:16 UTC |
| 8dd35c7 | Junio C Hamano | 03 December 2009, 08:06:52 UTC | Unconditionally set man.base.url.for.relative.links Even setting it to empty is better than leaving it unset as it prevents the warning cruft from appearing in the output. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 08:06:52 UTC |
| a479a56 | Junio C Hamano | 03 December 2009, 02:45:09 UTC | Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make Signed-off-by: Junio C Hamano <junio@kernel.org> | 03 December 2009, 02:45:09 UTC |
| 28044ba | Junio C Hamano | 02 December 2009, 18:29:00 UTC | Prepare for 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:29:00 UTC |
| ce9d823 | Junio C Hamano | 02 December 2009, 18:00:58 UTC | merge: do not add standard message when message is given with -m option Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいし ななこ <nanako3@lavabit.com> Date: Wed Dec 2 14:33:20 2009 +0900 Merge early part of side branch Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23' The gave her own message because she didn't want git to add the standard message (if she wanted to, she wouldn't have given one, or she would have prepared it using git-fmt-merge-msg command). Noticed by Nanako Shiraishi Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:02:08 UTC |
| 76bf488 | Junio C Hamano | 02 December 2009, 17:59:35 UTC | Do not misidentify "git merge foo HEAD" as an old-style invocation This was misinterpreted as an ancient style "git merge <message> HEAD <commit> <commit>..." that merges one (or more) <commit> into the current branch and record the resulting commit with the given message. Then a later sanity check found that there is no <commit> specified and gave a usage message. Tested-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:01:59 UTC |
| af6fbf9 | David Aguilar | 01 December 2009, 19:27:34 UTC | help: Do not unnecessarily look for a repository Although 'git help' actually doesn't need to be run inside a git repository and uses no repository-specific information, it looks for a git directory. Searching for a git directory can be annoying in auto-mount environments. With this commit, 'git help' no longer searches for a repository when run without any options. 7c3baa9 originally modified 'git help -a' to not require a repository. This applies the same fix for 'git help'. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:10:09 UTC |
