| b0ec16b | Junio C Hamano | 01 October 2012, 20:09:47 UTC | Git 1.8.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 October 2012, 20:09:47 UTC |
| abc05cb | Junio C Hamano | 01 October 2012, 19:59:10 UTC | Merge branch 'jk/completion-tests' * jk/completion-tests: t9902: add completion tests for "odd" filenames t9902: add a few basic completion tests | 01 October 2012, 19:59:11 UTC |
| 70dac5f | Junio C Hamano | 01 October 2012, 19:59:06 UTC | Merge branch 'ep/malloc-check-perturb' Fixes a brown-paper bag bug. * ep/malloc-check-perturb: MALLOC_CHECK: enable it, unless disabled explicitly | 01 October 2012, 19:59:06 UTC |
| 5ec11ab | Junio C Hamano | 01 October 2012, 19:58:57 UTC | Merge branch 'da/mergetool-custom' The actual external command to run for mergetool backend can be specified with difftool/mergetool.$name.cmd configuration variables, but this mechanism was ignored for the backends we natively support. * da/mergetool-custom: mergetool--lib: Allow custom commands to override built-ins | 01 October 2012, 19:58:57 UTC |
| 6975991 | Junio C Hamano | 01 October 2012, 19:58:51 UTC | Merge branch 'os/commit-submodule-ignore' "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. * os/commit-submodule-ignore: commit: pay attention to submodule.$name.ignore in .gitmodules | 01 October 2012, 19:58:52 UTC |
| 4dbf436 | Junio C Hamano | 01 October 2012, 19:58:43 UTC | Merge branch 'jc/blame-follows-renames' Clarify the "blame" documentation to tell the users that there is no need to ask for "--follow". * jc/blame-follows-renames: git blame: document that it always follows origin across whole-file renames | 01 October 2012, 19:58:43 UTC |
| 03b98d2 | Junio C Hamano | 01 October 2012, 19:58:34 UTC | Merge branch 'jk/receive-pack-unpack-error-to-pusher' Send errors from "unpack-objects" and "index-pack" back to the "git push" over the git and smart-http protocols, just like it is done for a push over the ssh protocol. * jk/receive-pack-unpack-error-to-pusher: receive-pack: drop "n/a" on unpacker errors receive-pack: send pack-processing stderr over sideband receive-pack: redirect unpack-objects stdout to /dev/null | 01 October 2012, 19:58:34 UTC |
| 92f6e98 | Junio C Hamano | 01 October 2012, 19:58:10 UTC | Merge branch 'rt/maint-clone-single' Running "git fetch" in a repository made with "git clone --single" slurps all the branches, defeating the point of "--single". * rt/maint-clone-single: clone --single: limit the fetch refspec to fetched branch | 01 October 2012, 19:58:10 UTC |
| 261b511 | Junio C Hamano | 30 September 2012, 06:28:20 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: Fixes to Swedish translation Update Swedish translation (1967t0f0u) l10n: zh.CN.po: msgmerge git.pot (1142t195f630u) l10n: Update git.pot (825 new, 24 removed messages) | 30 September 2012, 06:29:19 UTC |
| f65ed83 | Junio C Hamano | 30 September 2012, 05:50:53 UTC | Update draft release notes to 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2012, 06:25:09 UTC |
| 28de297 | Junio C Hamano | 30 September 2012, 06:22:53 UTC | Sync with 1.7.12.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2012, 06:22:53 UTC |
| d8cf053 | Junio C Hamano | 30 September 2012, 05:33:25 UTC | Git 1.7.12.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2012, 06:20:47 UTC |
| d4018a5 | Junio C Hamano | 30 September 2012, 06:20:13 UTC | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint Update German and Simplified Chinese translations. * 'maint' of git://github.com/git-l10n/git-po: l10n: de.po: correct translation of a 'rebase' message l10n: Improve many translation for zh_CN l10n: Unify the translation for '(un)expected' | 30 September 2012, 06:20:13 UTC |
| 31d69db | Junio C Hamano | 30 September 2012, 05:30:56 UTC | Merge branch 'jc/maint-log-grep-all-match-1' into maint * jc/maint-log-grep-all-match-1: grep.c: make two symbols really file-scope static this time t7810-grep: test --all-match with multiple --grep and --author options t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test multiple --author with --all-match t7810-grep: test multiple --grep with and without --all-match t7810-grep: bring log --grep tests in common form grep.c: mark private file-scope symbols as static log: document use of multiple commit limiting options log --grep/--author: honor --all-match honored for multiple --grep patterns grep: show --debug output only once grep: teach --debug option to dump the parse tree | 30 September 2012, 05:30:56 UTC |
| 52938b1 | Junio C Hamano | 30 September 2012, 05:30:47 UTC | Merge branch 'jc/maint-mailinfo-mime-attr' into maint * jc/maint-mailinfo-mime-attr: mailinfo: do not concatenate charset= attribute values from mime headers | 30 September 2012, 05:30:48 UTC |
| da5a2bd | Junio C Hamano | 30 September 2012, 05:28:32 UTC | Merge branch 'rr/maint-submodule-unknown-cmd' * rr/maint-submodule-unknown-cmd: submodule: if $command was not matched, don't parse other args | 30 September 2012, 05:28:33 UTC |
| f06e207 | Junio C Hamano | 30 September 2012, 05:28:28 UTC | Merge branch 'rs/archive-zip-utf8' With another reroll, it looks like the series is as polished as it could be. * rs/archive-zip-utf8: archive-zip: write extended timestamp archive-zip: support UTF-8 paths Revert "archive-zip: support UTF-8 paths" archive-zip: support UTF-8 paths | 30 September 2012, 05:28:28 UTC |
| fb1e4a8 | Junio C Hamano | 30 September 2012, 05:28:24 UTC | Merge branch 'jk/smart-http-switch' Allows users to turn off smart-http when talking to dumb-only servers. * jk/smart-http-switch: remote-curl: let users turn off smart http remote-curl: rename is_http variable | 30 September 2012, 05:28:25 UTC |
| c318040 | Junio C Hamano | 30 September 2012, 05:28:20 UTC | Merge branch 'sp/maint-http-enable-gzip' Allows a more common 'gzip' Accept-Encoding to be used. * sp/maint-http-enable-gzip: Enable info/refs gzip decompression in HTTP client | 30 September 2012, 05:28:20 UTC |
| d9c7314 | Junio C Hamano | 30 September 2012, 05:28:16 UTC | Merge branch 'sp/maint-http-info-refs-no-retry' Kills an old workaround for a unlikely server misconfiguration that hurts debuggability. * sp/maint-http-info-refs-no-retry: Revert "retry request without query when info/refs?query fails" | 30 September 2012, 05:28:16 UTC |
| 68a31b7 | Junio C Hamano | 30 September 2012, 05:28:12 UTC | Merge branch 'aw/rebase-i-edit-todo' Teach an option to edit the insn sheet to "git rebase -i". * aw/rebase-i-edit-todo: rebase -i: suggest using --edit-todo to fix an unknown instruction rebase -i: Add tests for "--edit-todo" rebase -i: Teach "--edit-todo" action rebase -i: Refactor help messages for todo file rebase usage: subcommands can not be combined with -i | 30 September 2012, 05:28:12 UTC |
| f5fd2a7 | Junio C Hamano | 30 September 2012, 05:28:05 UTC | Merge branch 'js/rebase-exec-command-not-found' * js/rebase-exec-command-not-found: rebase -i: fix misleading error message after 'exec no-such' instruction | 30 September 2012, 05:28:05 UTC |
| a275e82 | Junio C Hamano | 30 September 2012, 05:27:56 UTC | Merge branch 'rr/test-use-shell-path-not-shell' Fixes a brown-paper bag bug. * rr/test-use-shell-path-not-shell: test-lib: use $SHELL_PATH, not $SHELL | 30 September 2012, 05:27:56 UTC |
| bafed0d | Jeff King | 26 September 2012, 21:51:06 UTC | t9902: add completion tests for "odd" filenames We correctly handle completion items with spaces just fine, since we pass the lists around with newline delimiters. However, we do not handle filenames with shell metacharacters, as "compgen -W" performs expansion on the list we give it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2012, 00:25:52 UTC |
| 49ba92b | Jeff King | 26 September 2012, 21:47:51 UTC | t9902: add a few basic completion tests We were not testing ref or tree completion at all. Let's give them even basic sanity checks to avoid regressions. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2012, 00:25:48 UTC |
| b2f4b6c | Jiang Xin | 27 September 2012, 23:03:43 UTC | Merge git://github.com/gotgit/git-po-zh_CN * git://github.com/gotgit/git-po-zh_CN: l10n: zh.CN.po: msgmerge git.pot (1142t195f630u) | 27 September 2012, 23:03:43 UTC |
| 4d8e8ed | Jiang Xin | 27 September 2012, 22:53:54 UTC | Merge branch 'maint' * maint: l10n: de.po: correct translation of a 'rebase' message l10n: Improve many translation for zh_CN l10n: Unify the translation for '(un)expected' | 27 September 2012, 22:53:54 UTC |
| 5b3ba71 | Jiang Xin | 27 September 2012, 22:49:08 UTC | Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maint * 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN: l10n: Improve many translation for zh_CN l10n: Unify the translation for '(un)expected' | 27 September 2012, 22:49:08 UTC |
| 173c173 | Jiang Xin | 27 September 2012, 22:30:11 UTC | Merge branch 'maint' of https://github.com/ralfth/git-po-de into maint * 'maint' of https://github.com/ralfth/git-po-de: l10n: de.po: correct translation of a 'rebase' message | 27 September 2012, 22:30:11 UTC |
| 5f38e5e | Ralf Thielow | 24 September 2012, 17:16:21 UTC | l10n: de.po: correct translation of a 'rebase' message Noticed-by: Sascha Cunz <sascha-ml@babbelbox.org> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 27 September 2012, 18:58:51 UTC |
| ee1431b | René Scharfe | 26 September 2012, 20:16:39 UTC | MALLOC_CHECK: enable it, unless disabled explicitly The malloc checks in tests are currently disabled. Actually evaluate the variable for turning them off and enable them if it's unset. Also use this opportunity to give it the more descriptive and consistent name TEST_NO_MALLOC_CHECK. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2012, 06:39:13 UTC |
| 4e02667 | Peter Krefting | 26 September 2012, 07:06:36 UTC | l10n: Fixes to Swedish translation Fix bad translation of "Receiving objects". Make translation of push.default message narrower, to make it fit 80 columns even when prefixed. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 26 September 2012, 07:06:36 UTC |
| af9c9f9 | Ramkumar Ramachandra | 22 September 2012, 11:27:59 UTC | submodule: if $command was not matched, don't parse other args "git submodule" command DWIMs the command line and assumes a unspecified action word for 'status' action. This is a UI mistake that leads to a confusing behaviour. A mistyped command name is instead treated as a request for 'status' of the submodule with that name, e.g. $ git submodule show error: pathspec 'show' did not match any file(s) known to git. Did you forget to 'git add'? Stop DWIMming an unknown or mistyped subcommand name as pathspec given to unspelled "status" subcommand. "git submodule" without any argument is still interpreted as "git submodule status", but its value is questionable. Adjust t7400 to match, and stop advertising the default subcommand being 'status' which does not help much in practice, other than promoting laziness and confusion. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2012, 18:31:48 UTC |
| 652398a | Junio C Hamano | 25 September 2012, 17:44:32 UTC | Update draft release notes to 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2012, 17:44:32 UTC |
| 86bdfa3 | Junio C Hamano | 25 September 2012, 17:40:24 UTC | Merge branch 'rr/test-make-sure-we-have-git' Only the first test t0000 in the test suite made sure we have built Git to be tested; move the check to test-lib so that it applies to all tests equally. * rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built | 25 September 2012, 17:40:24 UTC |
| cbea001 | Junio C Hamano | 25 September 2012, 17:40:21 UTC | Merge branch 'js/hp-nonstop' Port to HP NonStop aka Tandem. * js/hp-nonstop: Port to HP NonStop | 25 September 2012, 17:40:21 UTC |
| d782797 | Junio C Hamano | 25 September 2012, 17:40:18 UTC | Merge branch 'js/poll-emu' * js/poll-emu: make poll() work on platforms that can't recv() on a non-socket poll() exits too early with EFAULT if 1st arg is NULL fix some win32 specific dependencies in poll.c make poll available for other platforms lacking it | 25 September 2012, 17:40:18 UTC |
| 0ec6aa5 | Junio C Hamano | 25 September 2012, 17:40:14 UTC | Merge branch 'ep/malloc-check-perturb' Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the built-in memory access checking facility GNU libc has. * ep/malloc-check-perturb: MALLOC_CHECK: various clean-ups Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption | 25 September 2012, 17:40:15 UTC |
| c4eed86 | Junio C Hamano | 25 September 2012, 17:40:11 UTC | Merge branch 'aj/xfuncname-ada' * aj/xfuncname-ada: Add userdiff patterns for Ada | 25 September 2012, 17:40:11 UTC |
| b1bb02d | Junio C Hamano | 25 September 2012, 17:39:56 UTC | Merge branch 'jc/maint-mailinfo-mime-attr' When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * jc/maint-mailinfo-mime-attr: mailinfo: do not concatenate charset= attribute values from mime headers | 25 September 2012, 17:39:56 UTC |
| ff91dbb | Junio C Hamano | 25 September 2012, 17:39:52 UTC | Merge branch 'po/maint-docs' Various documentation fixups. * po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth | 25 September 2012, 17:39:52 UTC |
| 8ccd4b6 | Junio C Hamano | 25 September 2012, 17:39:48 UTC | Merge branch 'db/doc-custom-xmlto' * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary | 25 September 2012, 17:39:48 UTC |
| 8e609b2 | Junio C Hamano | 25 September 2012, 17:25:52 UTC | Merge branch 'maint' * maint: Revert "completion: fix shell expansion of items" | 25 September 2012, 17:25:52 UTC |
| 4cde519 | Ramkumar Ramachandra | 22 September 2012, 04:55:10 UTC | test-lib: use $SHELL_PATH, not $SHELL The codepath for handling "--tee" ends up relaunching the test script under a shell, and that one has to be a Bourne. But we incorrectly used $SHELL, which could be a non-Bourne (e.g. zsh or csh); we have the Makefile variable $SHELL_PATH for exactly that, so use it instead. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2012, 17:17:29 UTC |
| a427ef7 | David Aguilar | 25 September 2012, 07:48:11 UTC | mergetool--lib: Allow custom commands to override built-ins Allow users to override the default commands provided by the mergetools/* scriptlets. Users occasionally run into problems where they expect to be able to override the built-in tool names. The documentation does not explicitly mention that built-ins cannot be overridden, so it's easy to assume that it should work. Lift this restriction so that built-in tools are handled the same way as user-configured tools. Add tests to guarantee this behavior. A nice benefit of this change is that it protects users from having future versions of git trump their custom configuration with a new built-in tool. C.f.: http://stackoverflow.com/questions/7435002/mergetool-from-gitconfig-being-ignored http://thread.gmane.org/gmane.comp.version-control.msysgit/13188 http://thread.gmane.org/gmane.comp.version-control.git/148267 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2012, 16:04:39 UTC |
| 666ca59 | Jeff King | 25 September 2012, 04:31:19 UTC | Revert "completion: fix shell expansion of items" This reverts commit 25ae7cfd19c8f21721363c64163cd5d9d1135b20. That patch does fix expansion of weird variables in some simple tests, but it also seems to break other things, like expansion of refs by "git checkout". While we're sorting out the correct solution, we are much better with the original bug (people with metacharacters in their completions occasionally see an error message) than the current bug (ref completion does not work at all). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2012, 16:00:28 UTC |
| b5d156c | Junio C Hamano | 24 September 2012, 19:50:36 UTC | Sync with maint | 24 September 2012, 19:50:36 UTC |
| 1a002c7 | Junio C Hamano | 24 September 2012, 19:50:00 UTC | Start preparation for 1.7.12.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2012, 19:50:00 UTC |
| 140011d | Junio C Hamano | 24 September 2012, 19:40:02 UTC | Merge branch 'jc/maint-blame-no-such-path' into maint Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. This incidentally fixes an unrelated problem on a case insensitive filesystem, where "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" did not say "No such file MAKEFILE in HEAD" but pretended as if "MAKEFILE" was a newly added file. * jc/maint-blame-no-such-path: blame: allow "blame file" in the middle of a conflicted merge blame $path: avoid getting fooled by case insensitive filesystems | 24 September 2012, 19:40:02 UTC |
| 8144049 | Junio C Hamano | 24 September 2012, 19:39:21 UTC | Merge branch 'dj/fetch-all-tags' into maint "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but combination "--all --tags" makes much less sense than "--all --no-tags"). * dj/fetch-all-tags: fetch --all: pass --tags/--no-tags through to each remote submodule: use argv_array instead of hand-building arrays fetch: use argv_array instead of hand-building arrays argv-array: fix bogus cast when freeing array argv-array: add pop function | 24 September 2012, 19:39:21 UTC |
| f9db192 | Jonathan "Duke" Leto | 24 September 2012, 17:41:26 UTC | Improve the description of GIT_PS1_SHOWUPSTREAM Describe what '=' means in the output of __git_ps1 when using GIT_PS1_SHOWUPSTREAM, which was not previously described. Signed-off-by: Jonathan "Duke" Leto <jonathan@leto.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2012, 19:38:41 UTC |
| 227bf59 | René Scharfe | 24 September 2012, 15:56:23 UTC | archive-zip: write extended timestamp File modification times in ZIP files are encoded in DOS format: local time with a granularity of two seconds. Add an extra field to all archive entries to also record the mtime in Unix' fashion, as UTC with a granularity of one second. This has the desirable side-effect of convincing Info-ZIP unzip 6.00 to respect general purpose flag 11, which is used to indicate that a file name is encoded in UTF-8. Any extra field would do, actually, but the extended timestamp is a reasonably small one (22 bytes per entry). Archives created by Info-ZIP zip 3.0 contain it, too (but with ctime and atime as well). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2012, 17:22:03 UTC |
| 8f6811e | Orgad Shaneh | 23 September 2012, 07:37:47 UTC | commit: pay attention to submodule.$name.ignore in .gitmodules "git status" does not list a submodule with uncommitted working tree files as modified when "submodule.$name.ignore" is set to "dirty" in in-tree ".gitmodules" file. Both status and commit honor the setting in $GIT_DIR/config, but "commit" does not pick it up from .gitmodules, which is inconsistent. Teach "git commit" to pay attention to the setting in .gitmodules as well. Signed-off-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2012, 16:28:36 UTC |
| e5dce96 | Junio C Hamano | 21 September 2012, 19:09:42 UTC | git blame: document that it always follows origin across whole-file renames Make it clear to people who (rightly or wrongly) think that the "--follow" option should follow origin across while-file renames that we already do so. That would explain the output that they see when they do give the "--follow" option to the command. We may or may not want to do a "--no-follow" patch as a follow-up, but that is a separate topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2012, 19:14:19 UTC |
| 16eed7c | Junio C Hamano | 21 September 2012, 18:17:00 UTC | Merge branch 'mh/fetch-filter-refs' Finishing touch to update documentation of string-list to make sure the earlier rewrite of ref-list match logic that depends on its sort order will not get broken. * mh/fetch-filter-refs: string_list API: document what "sorted" means | 21 September 2012, 18:17:00 UTC |
| 36d1f3d | Junio C Hamano | 21 September 2012, 18:14:49 UTC | Merge branch 'jc/maint-log-grep-all-match-1' A finishing touch to make two symbols that were meant to be file-scope static really so. * jc/maint-log-grep-all-match-1: grep.c: make two symbols really file-scope static this time | 21 September 2012, 18:14:49 UTC |
| 02572c2 | Jeff King | 20 September 2012, 21:30:58 UTC | remote-curl: let users turn off smart http Usually there is no need for users to specify whether an http remote is smart or dumb; the protocol is designed so that a single initial request is made, and the client can determine the server's capability from the response. However, some misconfigured dumb-only servers may not like the initial request by a smart client, as it contains a query string. Until recently, commit 703e6e7 worked around this by making a second request. However, that commit was recently reverted due to its side effect of masking the initial request's error code. Since git has had that workaround for several years, we don't know exactly how many such misconfigured servers are out there. The reversion of 703e6e7 assumes they are rare enough not to worry about. Still, that reversion leaves somebody who does run into such a server with no escape hatch at all. Let's give them an environment variable they can tweak to perform the "dumb" request. This is intentionally not a documented interface. It's overly simple and is really there for debugging in case somebody does complain about git not working with their server. A real user-facing interface would entail a per-remote or per-URL config variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2012, 17:33:11 UTC |
| 74eb32d | Jeff King | 21 September 2012, 05:38:46 UTC | receive-pack: drop "n/a" on unpacker errors The output from git push currently looks like this: $ git push dest HEAD fatal: [some message from index-pack] error: unpack failed: index-pack abnormal exit To dest ! [remote rejected] HEAD -> master (n/a (unpacker error)) That n/a is meant to be "the per-ref status is not available" but the nested parentheses just make it look ugly. Let's turn the final line into just: ! [remote rejected] HEAD -> master (unpacker error) Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2012, 16:50:13 UTC |
| a22e6f8 | Jeff King | 21 September 2012, 05:34:55 UTC | receive-pack: send pack-processing stderr over sideband Receive-pack invokes either unpack-objects or index-pack to handle the incoming pack. However, we do not redirect the stderr of the sub-processes at all, so it is never seen by the client. From the initial thread adding sideband support, which is here: http://thread.gmane.org/gmane.comp.version-control.git/139471 it is clear that some messages are specifically kept off the sideband (with the assumption that they are of interest only to an administrator, not the client). The stderr of the subprocesses is mentioned in the thread, but it's unclear if they are included in that group, or were simply forgotten. However, there are a few good reasons to show them to the client: 1. In many cases, they are directly about the incoming packfile (e.g., fsck warnings with --strict, corruption in the packfile, etc). Without these messages, the client just gets "unpacker error" with no extra useful diagnosis. 2. No matter what the cause, we are probably better off showing the errors to the client. If the client and the server admin are not the same entity, it is probably much easier for the client to cut-and-paste the errors they see than for the admin to try to dig them out of a log and correlate them with a particular session. 3. Users of the ssh transport typically already see these stderr messages, as the remote's stderr is copied literally by ssh. This brings other transports (http, and push-over-git if you are crazy enough to enable it) more in line with ssh. As a bonus for ssh users, because the messages are now fed through the sideband and printed by the local git, they will have "remote:" prepended and be properly interleaved with any local output to stderr. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2012, 16:49:47 UTC |
| 59bfdfb | Jeff King | 21 September 2012, 05:32:52 UTC | receive-pack: redirect unpack-objects stdout to /dev/null The unpack-objects command should not generally produce any output on stdout. However, if it's given extra input after the packfile, it will spew the remainder to stdout. When called by receive-pack, this means we will break protocol, since our stdout is connected to the remote send-pack. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2012, 16:44:11 UTC |
| 1414786 | Peter Krefting | 21 September 2012, 14:54:42 UTC | Update Swedish translation (1967t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 21 September 2012, 14:54:42 UTC |
| f1c62ee | Junio C Hamano | 20 September 2012, 22:55:47 UTC | Merge branch 'maint' * maint: Documentation: Document signature showing options completion: fix shell expansion of items | 20 September 2012, 22:55:47 UTC |
| 8ef2794 | Junio C Hamano | 20 September 2012, 22:55:31 UTC | Merge branch 'nd/maint-diffstat-summary' into maint * nd/maint-diffstat-summary: Revert diffstat back to English | 20 September 2012, 22:55:31 UTC |
| 467ad25 | Junio C Hamano | 20 September 2012, 22:55:22 UTC | Merge branch 'jw/doc-commit-title' into maint * jw/doc-commit-title: Documentation: describe subject more precisely | 20 September 2012, 22:55:22 UTC |
| cc84144 | Junio C Hamano | 20 September 2012, 22:55:12 UTC | Merge branch 'dg/run-command-child-cleanup' into maint * dg/run-command-child-cleanup: run-command.c: fix broken list iteration in clear_child_for_cleanup | 20 September 2012, 22:55:12 UTC |
| 96c2abe | Junio C Hamano | 20 September 2012, 22:55:03 UTC | Merge branch 'jc/mailinfo-RE' into maint * jc/mailinfo-RE: mailinfo: strip "RE: " prefix | 20 September 2012, 22:55:03 UTC |
| ee70fb8 | Junio C Hamano | 20 September 2012, 22:54:57 UTC | Merge branch 'sn/ls-remote-get-url-doc' into maint * sn/ls-remote-get-url-doc: ls-remote: document the '--get-url' option | 20 September 2012, 22:54:57 UTC |
| 9fcacaa | Junio C Hamano | 20 September 2012, 22:54:43 UTC | Merge branch 'nd/log-n-doc' into maint * nd/log-n-doc: doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt | 20 September 2012, 22:54:43 UTC |
| f9c2d2b | Junio C Hamano | 20 September 2012, 22:53:31 UTC | Merge branch 'nd/maint-remote-remove' into maint * nd/maint-remote-remove: remote: prefer subcommand name 'remove' to 'rm' | 20 September 2012, 22:53:31 UTC |
| 3083301 | Junio C Hamano | 20 September 2012, 21:20:09 UTC | grep.c: make two symbols really file-scope static this time Adding a declaration at the beginning is not sufficient for obvious reasons. The definition has to be made static. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 21:20:09 UTC |
| 31b808a | Ralf Thielow | 20 September 2012, 18:04:08 UTC | clone --single: limit the fetch refspec to fetched branch After running "git clone --single", the resulting repository has the usual default "+refs/heads/*:refs/remotes/origin/*" wildcard fetch refspec installed, which means that a subsequent "git fetch" will end up grabbing all the other branches. Update the fetch refspec to cover only the singly cloned ref instead to correct this. That means: If "--single" is used without "--branch" or "--mirror", the fetch refspec covers the branch on which remote's HEAD points to. If "--single" is used with "--branch", it'll cover only the branch specified in the "--branch" option. If "--single" is combined with "--mirror", then it'll cover all refs of the cloned repository. If "--single" is used with "--branch" that specifies a tag, then it'll cover only the ref for this tag. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 21:15:35 UTC |
| 243c329 | Jeff King | 20 September 2012, 17:00:22 UTC | remote-curl: rename is_http variable We don't actually care whether the connection is http or not; what we care about is whether it might be smart http. Rename the variable to be more accurate, which will make it easier to later make smart-http optional. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 17:48:45 UTC |
| f2fef7b | Stephen Boyd | 20 September 2012, 08:10:38 UTC | Documentation: Document signature showing options The pretty formats for GPG signatures were introduced but never documented. Use the documentation from the commit that introduced them. Do the same for the --show-signature option added to git log and friends. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 17:28:51 UTC |
| aa90b96 | Shawn O. Pearce | 19 September 2012, 23:12:02 UTC | Enable info/refs gzip decompression in HTTP client Some HTTP servers try to use gzip compression on the /info/refs request to save transfer bandwidth. Repositories with many tags may find the /info/refs request can be gzipped to be 50% of the original size due to the few but often repeated bytes used (hex SHA-1 and commonly digits in tag names). For most HTTP requests enable "Accept-Encoding: gzip" ensuring the /info/refs payload can use this encoding format. Only request gzip encoding from servers. Although deflate is supported by libcurl, most servers have standardized on gzip encoding for compression as that is what most browsers support. Asking for deflate increases request sizes by a few bytes, but is unlikely to ever be used by a server. Disable the Accept-Encoding header on probe RPCs as response bodies are supposed to be exactly 4 bytes long, "0000". The HTTP headers requesting and indicating compression use more space than the data transferred in the body. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 17:26:50 UTC |
| 6ac964a | Shawn O. Pearce | 20 September 2012, 05:58:00 UTC | Revert "retry request without query when info/refs?query fails" This reverts commit 703e6e76a14825e5b0c960d525f34e607154b4f7. Retrying without the query parameter was added as a workaround for a single broken HTTP server at git.debian.org[1]. The server was misconfigured to route every request with a query parameter into gitweb.cgi. Admins fixed the server's configuration within 16 hours of the bug report to the Git mailing list, but we still patched Git with this fallback and have been paying for it since. Most Git hosting services configure the smart HTTP protocol and the retry logic confuses users when there is a transient HTTP error as Git dropped the real error from the smart HTTP request. Removing the retry makes root causes easier to identify. [1] http://thread.gmane.org/gmane.comp.version-control.git/137609 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 17:25:21 UTC |
| 25ae7cf | Felipe Contreras | 20 September 2012, 02:15:15 UTC | completion: fix shell expansion of items As reported by Jeroen Meijer[1]; the current code doesn't deal properly with items (tags, branches, etc.) that have ${} in them because they get expaned by bash while using compgen. A simple solution is to quote the items so they get expanded properly (\$\{\}). In order to achieve that I took bash-completion's quote() function, which is rather simple, and renamed it to __git_quote() as per Jeff King's suggestion. Solves the original problem for me. [1] http://article.gmane.org/gmane.comp.version-control.git/201596 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 16:52:36 UTC |
| 6c10990 | Joachim Schmitz | 19 September 2012, 10:03:30 UTC | Port to HP NonStop Includes the addition of some new defines and their description for others to use. Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2012, 00:31:25 UTC |
| dd4f307 | Dave Borowitz | 19 September 2012, 17:06:37 UTC | Documentation/Makefile: Allow custom XMLTO binary Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 23:35:10 UTC |
| 9c8e101 | Johannes Sixt | 19 September 2012, 06:43:54 UTC | rebase -i: suggest using --edit-todo to fix an unknown instruction We have now an explicit UI to edit the todo sheet and need not disclose the name of the file. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 19:52:10 UTC |
| f0970fa | Philip Oakley | 18 September 2012, 23:25:34 UTC | Doc branch: show -vv option and alternative Indicate that the -v option can be given twice in the short options. Without it users pass over the option. Also indicate the alternate 'git remote show' method. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 17:22:49 UTC |
| 068c674 | Philip Oakley | 18 September 2012, 23:25:33 UTC | Doc clean: add See Also link 'git clean' is controlled by gitignore. Provide See Also link for it. Use of core.excludesfile is implied. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 04:49:50 UTC |
| a73d379 | Philip Oakley | 18 September 2012, 23:25:32 UTC | Doc add: link gitignore Use a gitignore link rather than the gitrepository- layout link. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 04:49:46 UTC |
| 3f8c5a4 | Philip Oakley | 18 September 2012, 23:25:31 UTC | Doc: separate gitignore pattern sources Use separate bulleted paragraphs for the three different gitignore pattern sources. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 04:47:45 UTC |
| bc40dea | Philip Oakley | 18 September 2012, 23:25:28 UTC | Doc: shallow clone deepens _to_ new depth Clarify that 'depth=' specifies the new depth from the remote's branch tip. It does not add the depth to the existing shallow clone. (details from pack-protocol.txt). Clarify that tags are not fetched. (details from shallow.txt) Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2012, 04:47:12 UTC |
| b0576a6 | Junio C Hamano | 18 September 2012, 21:43:12 UTC | Update draft release notes to 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 21:43:12 UTC |
| 3d7535e | Junio C Hamano | 18 September 2012, 21:37:53 UTC | Merge branch 'jc/maint-log-grep-all-match' Fix a long-standing bug in "git log --grep" when multiple "--grep" are used together with "--all-match" and "--author" or "--committer". * jc/maint-log-grep-all-match: t7810-grep: test --all-match with multiple --grep and --author options t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test multiple --author with --all-match t7810-grep: test multiple --grep with and without --all-match t7810-grep: bring log --grep tests in common form grep.c: mark private file-scope symbols as static log: document use of multiple commit limiting options log --grep/--author: honor --all-match honored for multiple --grep patterns grep: show --debug output only once grep: teach --debug option to dump the parse tree | 18 September 2012, 21:37:54 UTC |
| 06e211a | Junio C Hamano | 18 September 2012, 21:37:46 UTC | Merge branch 'jc/make-static' Turn many file-scope private symbols to static to reduce the global namespace contamination. * jc/make-static: sequencer.c: mark a private file-scope symbol as static ident.c: mark private file-scope symbols as static trace.c: mark a private file-scope symbol as static wt-status.c: mark a private file-scope symbol as static read-cache.c: mark a private file-scope symbol as static strbuf.c: mark a private file-scope symbol as static sha1-array.c: mark a private file-scope symbol as static symlinks.c: mark private file-scope symbols as static notes.c: mark a private file-scope symbol as static rerere.c: mark private file-scope symbols as static graph.c: mark private file-scope symbols as static diff.c: mark a private file-scope symbol as static commit.c: mark a file-scope private symbol as static builtin/notes.c: mark file-scope private symbols as static | 18 September 2012, 21:37:46 UTC |
| 8db3865 | Junio C Hamano | 18 September 2012, 21:36:17 UTC | Merge branch 'pw/p4-submit-conflicts' Add '--conflict' option to git-p4 subcommand to specify what action to take when conflicts are found during 'p4 submit'. * pw/p4-submit-conflicts: git-p4: add submit --conflict option and config varaiable git p4: add submit --prepare-p4-only option git p4: add submit --dry-run option git p4: accept -v for --verbose git p4: revert deleted files after submit cancel git p4: rearrange submit template construction git p4: test clean-up after failed submit, fix added files git p4: standardize submit cancel due to unchanged template git p4: move conflict prompt into run, add [q]uit input git p4: remove submit failure options [a]pply and [w]rite git p4: gracefully fail if some commits could not be applied git p4 test: remove bash-ism of combined export/assignment | 18 September 2012, 21:36:17 UTC |
| 3387423 | Junio C Hamano | 18 September 2012, 21:36:00 UTC | Merge branch 'mv/cherry-pick-s' After "git cherry-pick -s" gave control back to the user asking help to resolve conflicts, concluding "git commit" needs to be run with "-s" if the user wants to sign it off, but the command should be able to remember that. * mv/cherry-pick-s: cherry-pick: don't forget -s on failure | 18 September 2012, 21:36:00 UTC |
| d71abd9 | Junio C Hamano | 18 September 2012, 21:35:54 UTC | Merge branch 'nd/fetch-status-alignment' The status report from "git fetch", when messages like 'up-to-date' are translated, did not align the branch names well. * nd/fetch-status-alignment: fetch: align per-ref summary report in UTF-8 locales | 18 September 2012, 21:35:55 UTC |
| 3c7d509 | Junio C Hamano | 18 September 2012, 21:35:03 UTC | Sync with 1.7.12.1 | 18 September 2012, 21:35:03 UTC |
| 304b7d9 | Junio C Hamano | 18 September 2012, 21:34:31 UTC | Git 1.7.12.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 21:34:31 UTC |
| 39e2e02 | Junio C Hamano | 18 September 2012, 21:33:52 UTC | Merge branch 'er/doc-fast-import-done' into maint * er/doc-fast-import-done: fast-import: document the --done option | 18 September 2012, 21:33:52 UTC |
| 8ffc331 | Junio C Hamano | 18 September 2012, 21:24:06 UTC | Merge branch 'jk/config-warn-on-inaccessible-paths' into maint The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed. * jk/config-warn-on-inaccessible-paths: attr: failure to open a .gitattributes file is OK with ENOTDIR warn_on_inaccessible(): a helper to warn on inaccessible paths attr: warn on inaccessible attribute files gitignore: report access errors of exclude files config: warn on inaccessible files | 18 September 2012, 21:24:06 UTC |
| 2006f0a | Ramkumar Ramachandra | 17 September 2012, 17:06:19 UTC | t/test-lib: make sure Git has already been built When tests were run without building git, they stopped with: .: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS Move the check that makes sure that git has already been built from t0000 to test-lib, so that any test will do so before it runs. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 21:22:19 UTC |
| 01f7d7f | Philip Oakley | 16 September 2012, 10:57:58 UTC | Doc: Improve shallow depth wording Avoid confusion in compound sentence about the start of the commit set and the depth measure. Use two sentences. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 20:35:56 UTC |
| 88182ba | René Scharfe | 18 September 2012, 19:46:56 UTC | archive-zip: support UTF-8 paths Set general purpose flag 11 if we encounter a path that contains non-ASCII characters. We assume that all paths are given as UTF-8; no conversion is done. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 20:33:09 UTC |
| bb52d22 | Junio C Hamano | 18 September 2012, 20:32:39 UTC | Revert "archive-zip: support UTF-8 paths" This reverts commit 2162bd8cc461d6c3a12ab81c5db5a44bf5ecabc3; a two-patch series to replace it will follow. | 18 September 2012, 20:32:39 UTC |
| ecfe1ea | Johannes Sixt | 18 September 2012, 11:15:26 UTC | rebase -i: fix misleading error message after 'exec no-such' instruction When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can fix the problem, and then run git rebase --continue fatal: 'rebase' appears to be a git command, but we were not able to execute it. Maybe git-rebase is broken? The reason is that the shell that attempted to run the command exits with code 127. rebase--interactive just forwards this code to the caller (the git wrapper). But our smart run-command infrastructure detects this special exit code and turns it into ENOENT, which in turn is interpreted by the git wrapper as if the external command that it just executed did not exist. This is finally translated to the misleading last two lines in error message cited above. Fix it by translating the error code before it is forwarded. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 20:27:45 UTC |
| 8093ae8 | Andreas Schwab | 18 September 2012, 15:55:08 UTC | Documentation/git-filter-branch: Move note about effect of removing commits The note that explains that changes introduced by removed commits are preserved should be placed directly after the paragraph that describes such commits removal. Otherwise the reference to "the commits" appears out of context. Also the big example that follows "Consider this history" is about rewriting part of the history DAG. Move the paragraph that describes the operation close to it. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2012, 19:51:58 UTC |
