| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 176943b | Junio C Hamano | 17 September 2012, 21:17:58 UTC | mailinfo: do not concatenate charset= attribute values from mime headers "Content-type: text/plain; charset=UTF-8" header should not appear twice in the input, but it is always better to gracefully deal with such a case. The current code concatenates the value to the values we have seen previously, producing nonsense such as "utf8UTF-8". Instead of concatenating, forget the previous value and use the last value we see. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 22:24:52 UTC |
| 5805853 | Ramkumar Ramachandra | 17 September 2012, 17:06:18 UTC | t/perf: add "trash directory" to .gitignore Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 21:27:55 UTC |
| d9fcff2 | Adam Spiers | 17 September 2012, 11:38:51 UTC | Add missing -z to git check-attr usage text for consistency with man page Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 20:45:32 UTC |
| 6108b04 | Mischa POSLAWSKY | 17 September 2012, 01:21:55 UTC | git-jump: ignore (custom) prefix in diff mode Matching the default file prefix b/ does not yield any results if config option diff.noprefix or diff.mnemonicprefix is enabled. Signed-off-by: Mischa POSLAWSKY <git@shiar.nl> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 19:31:57 UTC |
| 2ce4fee | Wesley J. Landaker | 17 September 2012, 14:22:15 UTC | Documentation: indent-with-non-tab uses "equivalent tabs" not 8 Update the documentation of the core.whitespace option "indent-with-non-tab" to correctly reflect that it catches the use of spaces instead of the equivalent tabs, rather than a fixed number. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 17:23:21 UTC |
| 7dd9ab0 | Yacine Belkadi | 16 September 2012, 16:06:11 UTC | completion: add --no-edit to git-commit Signed-off-by: Yacine Belkadi <yacine.belkadi.1@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2012, 05:05:07 UTC |
| 39f2e01 | Michael J Gruber | 14 September 2012, 09:46:43 UTC | t7810-grep: test --all-match with multiple --grep and --author options The code used to have a bug that ignores "--all-match", that requires all "--grep" to have matched, when "--author" or "--committer" was used. Make sure the bug will not be reintroduced. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:40 UTC |
| 2cb03e7 | Michael J Gruber | 14 September 2012, 09:46:42 UTC | t7810-grep: test interaction of multiple --grep and --author options There are tests for this interaction already. Restructure slightly and avoid any claims about --all-match. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:40 UTC |
| 00f62a6 | Michael J Gruber | 14 September 2012, 09:46:41 UTC | t7810-grep: test multiple --author with --all-match The "--all-match" option is about "--grep", and does not affect how "--author" or "--committer" limitation is applied. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:40 UTC |
| dfe3642 | Michael J Gruber | 14 September 2012, 09:46:40 UTC | t7810-grep: test multiple --grep with and without --all-match Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:40 UTC |
| b327bf7 | Michael J Gruber | 14 September 2012, 09:46:39 UTC | t7810-grep: bring log --grep tests in common form The log --grep tests generate the expected out in different ways. Make them all use command blocks so that subshells are avoided and the expected output is easier to grasp visually. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:39 UTC |
| 07a7d65 | Junio C Hamano | 15 September 2012, 21:04:36 UTC | grep.c: mark private file-scope symbols as static Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2012, 06:35:39 UTC |
| d4d39bc | Junio C Hamano | 15 September 2012, 04:37:51 UTC | Draft release notes to 1.7.12.1 We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2012, 04:37:51 UTC |
| c13a5ac | Junio C Hamano | 15 September 2012, 04:32:07 UTC | Merge branch 'sb/send-email-reconfirm-fix' into maint * sb/send-email-reconfirm-fix: send-email: initial_to and initial_reply_to are both optional | 15 September 2012, 04:32:07 UTC |
| 448e370 | Junio C Hamano | 15 September 2012, 04:32:01 UTC | Merge branch 'jc/send-email-reconfirm' into maint * jc/send-email-reconfirm: send-email: validate & reconfirm interactive responses | 15 September 2012, 04:32:01 UTC |
| 78ed88d | Junio C Hamano | 15 September 2012, 04:24:18 UTC | Merge branch 'mz/cherry-pick-cmdline-order' into maint * mz/cherry-pick-cmdline-order: cherry-pick/revert: respect order of revisions to pick demonstrate broken 'git cherry-pick three one two' teach log --no-walk=unsorted, which avoids sorting | 15 September 2012, 04:24:18 UTC |
| c336bc1 | Junio C Hamano | 15 September 2012, 04:20:40 UTC | Sync with 1.7.11.7 | 15 September 2012, 04:20:40 UTC |
| bafc478 | Junio C Hamano | 15 September 2012, 03:57:23 UTC | Git 1.7.11.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2012, 03:57:23 UTC |
| 19ece72 | Junio C Hamano | 15 September 2012, 03:48:31 UTC | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 * jk/maint-quiet-is-synonym-to-s-in-log: log: fix --quiet synonym for -s | 15 September 2012, 03:48:31 UTC |
| ddbca33 | Junio C Hamano | 15 September 2012, 03:48:22 UTC | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11 * jc/maint-ident-missing-human-name: split_ident_line(): make best effort when parsing author/committer line | 15 September 2012, 03:48:22 UTC |
| dabdc01 | Junio C Hamano | 15 September 2012, 03:46:39 UTC | Merge branch 'rj/test-regex' into maint-1.7.11 * rj/test-regex: test-regex: Add a test to check for a bug in the regex routines | 15 September 2012, 03:46:39 UTC |
| f463cc5 | Junio C Hamano | 15 September 2012, 03:45:55 UTC | Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 * da/gitk-reload-tag-contents: gitk: Rename 'tagcontents' to 'cached_tagcontent' gitk: Teach "Reread references" to reload tags gitk: Avoid Meta1-F5 | 15 September 2012, 03:45:55 UTC |
| 6711759 | Junio C Hamano | 15 September 2012, 03:45:03 UTC | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11 * jc/maint-checkout-fileglob-doc: gitcli: contrast wildcard given to shell and to git gitcli: formatting fix Document file-glob for "git checkout -- '*.c'" | 15 September 2012, 03:45:03 UTC |
| a23e313 | Junio C Hamano | 14 September 2012, 01:54:30 UTC | log: document use of multiple commit limiting options Generally speaking, using more options will further narrow the selection, but there are a few exceptions. Document them. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 17:23:47 UTC |
| 13e4fc7 | Junio C Hamano | 13 September 2012, 23:26:57 UTC | log --grep/--author: honor --all-match honored for multiple --grep patterns When we have both header expression (which has to be an OR node by construction) and a pattern expression (which could be anything), we create a new top-level OR node to bind them together, and the resulting expression structure looks like this: OR / \ / \ pattern OR / \ / \ ..... committer OR / \ author TRUE The three elements on the top-level backbone that are inspected by the "all-match" logic are "pattern", "committer" and "author". When there are more than one elements in the "pattern", the top-level node of the "pattern" part of the subtree is an OR, and that node is inspected by "all-match". The result ends up ignoring the "--all-match" given from the command line. A match on either side of the pattern is considered a match, hence: git log --grep=A --grep=B --author=C --all-match shows the same "authored by C and has either A or B" that is correct only when run without "--all-match". Fix this by turning the resulting expression around when "--all-match" is in effect, like this: OR / \ / \ / OR committer / \ author \ pattern The set of nodes on the top-level backbone in the resulting expression becomes "committer", "author", and the nodes that are on the top-level backbone of the "pattern" subexpression. This makes the "all-match" logic inspect the same nodes in "pattern" as the case without the author and/or the committer restriction, and makes the earlier "log" example to show "authored by C and has A and has B", which is what the command line expects. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 17:12:56 UTC |
| 208f5aa | Michael J Gruber | 14 September 2012, 09:46:35 UTC | grep: show --debug output only once When threaded grep is in effect, the patterns are duplicated and recompiled for each thread. Avoid "--debug" output during the recompilation so that the output is given once instead of "1+nthreads" times. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 17:11:44 UTC |
| 17bf35a | Junio C Hamano | 13 September 2012, 21:21:44 UTC | grep: teach --debug option to dump the parse tree Our "grep" allows complex boolean expressions to be formed to match each individual line with operators like --and, '(', ')' and --not. Introduce the "--debug" option to show the parse tree to help people who want to debug and enhance it. Also "log" learns "--grep-debug" option to do the same. The command line parser to the log family is a lot more limited than the general "git grep" parser, but it has special handling for header matching (e.g. "--author"), and a parse tree is valuable when working on it. Note that "--all-match" is *not* any individual node in the parse tree. It is an instruction to the evaluator to check all the nodes in the top-level backbone have matched and reject a document as non-matching otherwise. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 17:10:35 UTC |
| 218adaa | Nguyễn Thái Ngọc Duy | 13 September 2012, 14:16:26 UTC | Revert diffstat back to English This reverts the i18n part of 7f81463 (Use correct grammar in diffstat summary line - 2012-02-01) but still keeps the grammar correctness for English. It also reverts b354f11 (Fix tests under GETTEXT_POISON on diffstat - 2012-08-27). The result is diffstat always in English for all commands. This helps stop users from accidentally sending localized format-patch'd patches. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 16:52:16 UTC |
| 8e950da | Junio C Hamano | 13 September 2012, 19:40:39 UTC | attr: failure to open a .gitattributes file is OK with ENOTDIR Often we consult an in-tree .gitattributes file that exists per directory. Majority of directories do not usually have such a file, and it is perfectly fine if we cannot open it because there is no such file, but we do want to know when there is an I/O or permission error. Earlier, we made the codepath warn when we fail to open it for reasons other than ENOENT for that reason. We however sometimes have to attempt to open the .gitattributes file from a directory that does not exist in the commit that is currently checked out. "git pack-objects" wants to know if a path is marked with "-delta" attributes, and "git archive" wants to know about export-ignore and export-subst attributes. Both commands may and do need to ask the attributes system about paths in an arbitrary commit. "git diff", after removing an entire directory, may want to know textconv on paths that used to be in that directory. Make sure we also ignore a failure to open per-directory attributes file due to ENOTDIR. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 05:15:10 UTC |
| 52ffe99 | Jeremy White | 13 September 2012, 22:27:09 UTC | Documentation: describe subject more precisely The discussion of email subject throughout the documentation is misleading; it indicates that the first line will always become the subject. In fact, the subject is generally all lines up until the first full blank line. This patch refines that, and makes more use of the concept of a commit title, with the title being all text up to the first blank line. Signed-off-by: Jeremy White <jwhite@codeweavers.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2012, 04:30:21 UTC |
| e70d163 | Junio C Hamano | 12 September 2012, 21:10:54 UTC | Further merging in preparation for 1.7.12.1 Describe the following in the draft release notes: . jc/apply-binary-p0 . jc/dotdot-is-parent-directory . jc/maint-doc-checkout-b-always-takes-branch-name . jk/maint-http-half-auth-push . kk/maint-for-each-ref-multi-sort Yet to be merged before 1.7.12.1 are: . jk/config-warn-on-inaccessible-paths . jk/maint-quiet-is-synonym-to-s-in-log . mz/cherry-pick-cmdline-order Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2012, 21:12:48 UTC |
| 3503e9a | Junio C Hamano | 12 September 2012, 21:08:05 UTC | Merge branch 'maint-1.7.11' into maint | 12 September 2012, 21:08:05 UTC |
| 1403db4 | Junio C Hamano | 12 September 2012, 21:00:52 UTC | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 "git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this problem. * jc/apply-binary-p0: apply: compute patch->def_name correctly under -p0 | 12 September 2012, 21:00:53 UTC |
| eaff724 | Junio C Hamano | 12 September 2012, 21:00:34 UTC | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 "git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * jc/dotdot-is-parent-directory: specifying ranges: we did not mean to make ".." an empty set | 12 September 2012, 21:00:34 UTC |
| 1b8bc86 | Junio C Hamano | 12 September 2012, 20:59:58 UTC | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.7.11 The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. * jc/maint-doc-checkout-b-always-takes-branch-name: doc: "git checkout -b/-B/--orphan" always takes a branch name | 12 September 2012, 20:59:58 UTC |
| 7d9483c | Junio C Hamano | 12 September 2012, 20:58:22 UTC | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11 Pushing to smart HTTP server with recent Git fails without having the username in the URL to force authentication, if the server is configured to allow GET anonymously, while requiring authentication for POST. * jk/maint-http-half-auth-push: http: prompt for credentials on failed POST http: factor out http error code handling t: test http access to "half-auth" repositories t: test basic smart-http authentication t/lib-httpd: recognize */smart/* repos as smart-http t/lib-httpd: only route auth/dumb to dumb repos t5550: factor out http auth setup t5550: put auth-required repo in auth/dumb | 12 September 2012, 20:58:23 UTC |
| 92c830d | Junio C Hamano | 12 September 2012, 20:57:43 UTC | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11 "git for-each-ref" did not honor multiple "--sort=<key>" arguments correctly. * kk/maint-for-each-ref-multi-sort: for-each-ref: Fix sort with multiple keys t6300: test sort with multiple keys | 12 September 2012, 20:57:43 UTC |
| 9aeaab6 | Junio C Hamano | 11 September 2012, 21:30:03 UTC | blame: allow "blame file" in the middle of a conflicted merge "git blame file" has always meant "find the origin of each line of the file in the history leading to HEAD, oh by the way, blame the lines that are modified locally to the working tree". This teaches "git blame" that during a conflicted merge, some uncommitted changes may have come from the other history that is being merged. The verify_working_tree_path() function introduced in the previous patch to notice a typo in the filename (primarily on case insensitive filesystems) has been updated to allow a filename that does not exist in HEAD (i.e. the tip of our history) as long as it exists one of the commits being merged, so that a "we deleted, the other side modified" case tracks the history of the file in the history of the other side. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 21:30:03 UTC |
| cbd6b08 | Junio C Hamano | 11 September 2012, 18:27:35 UTC | Further merging down for 1.7.12.1 We will wait for a handful of other fixes that have graduated to the 'master' for 1.8.0 to be tested in the wild and then tag 1.7.12.1: . mz/cherry-pick-cmdline-order . jk/maint-quiet-is-synonym-to-s-in-log . jk/maint-http-half-auth-push . jc/apply-binary-p0 . jk/config-warn-on-inaccessible-paths . kk/maint-for-each-ref-multi-sort Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 18:27:35 UTC |
| 1c88a6d | Junio C Hamano | 11 September 2012, 18:23:45 UTC | Sync with 1.7.11.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 18:23:54 UTC |
| 3119084 | Junio C Hamano | 11 September 2012, 18:23:06 UTC | Merge branch 'js/use-sc-open-max' into maint * js/use-sc-open-max: sha1_file.c: introduce get_max_fd_limit() helper | 11 September 2012, 18:23:06 UTC |
| 2332834 | Junio C Hamano | 11 September 2012, 18:22:58 UTC | Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maint * js/no-curl-easy-strerror-on-old-curl: http.c: don't use curl_easy_strerror prior to curl-7.12.0 | 11 September 2012, 18:22:58 UTC |
| e09e402 | Junio C Hamano | 11 September 2012, 18:18:48 UTC | Git 1.7.11.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 18:18:48 UTC |
| 23242a6 | Junio C Hamano | 11 September 2012, 18:10:23 UTC | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11 * jc/maint-mergetool-style-fix: mergetool: style fixes | 11 September 2012, 18:10:23 UTC |
| ee7a83f | Junio C Hamano | 11 September 2012, 18:10:17 UTC | Merge branch 'sz/submodule-force-update' into maint-1.7.11 * sz/submodule-force-update: Make 'git submodule update --force' always check out submodules. | 11 September 2012, 18:10:17 UTC |
| ef92392 | Junio C Hamano | 11 September 2012, 18:10:12 UTC | Merge branch 'ph/stash-rerere' into maint-1.7.11 * ph/stash-rerere: stash: invoke rerere in case of conflict test: git-stash conflict sets up rerere | 11 September 2012, 18:10:12 UTC |
| 91feb38 | Junio C Hamano | 11 September 2012, 18:09:19 UTC | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 * jc/maint-sane-execvp-notdir: sane_execvp(): ignore non-directory on $PATH | 11 September 2012, 18:09:19 UTC |
| 4c3fda0 | Junio C Hamano | 11 September 2012, 18:09:09 UTC | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 * jc/maint-config-exit-status: config: "git config baa" should exit with status 1 | 11 September 2012, 18:09:09 UTC |
| f6854ca | Junio C Hamano | 11 September 2012, 18:09:01 UTC | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 * mh/maint-config-doc-proxy-command: git-config doc: unconfuse an example git-config.txt: fix example | 11 September 2012, 18:09:01 UTC |
| fe31b2a | Junio C Hamano | 11 September 2012, 18:08:55 UTC | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 * hv/submodule-path-unmatch: Let submodule command exit with error status if path does not exist | 11 September 2012, 18:08:55 UTC |
| ef66ac3 | Junio C Hamano | 11 September 2012, 18:08:48 UTC | Merge branch 'mz/empty-rebase-test' into maint-1.7.11 * mz/empty-rebase-test: add tests for 'git rebase --keep-empty' | 11 September 2012, 18:08:48 UTC |
| 515cd19 | Junio C Hamano | 11 September 2012, 18:08:40 UTC | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11 * jk/docs-docbook-monospace-display: docs: monospace listings in docbook output | 11 September 2012, 18:08:40 UTC |
| d9b983f | Junio C Hamano | 11 September 2012, 18:08:30 UTC | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11 * ab/diff-write-incomplete-line: Fix '\ No newline...' annotation in rewrite diffs | 11 September 2012, 18:08:30 UTC |
| ffb1346 | Junio C Hamano | 11 September 2012, 18:08:18 UTC | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11 * jc/maint-t7406-rev-parse-max-count-huh: t7406: fix misleading "rev-parse --max-count=1 HEAD" | 11 September 2012, 18:08:18 UTC |
| 8bc72fc | Junio C Hamano | 11 September 2012, 18:07:14 UTC | Merge branch 'rr/precompose-utf8-cleanup' into maint * rr/precompose-utf8-cleanup: precompose-utf8: do not call checks for non-ascii "utf8" cleanup precompose_utf8 | 11 September 2012, 18:07:14 UTC |
| 59d7cbd | Junio C Hamano | 11 September 2012, 18:06:45 UTC | Merge branch 'jc/capabilities' into maint * jc/capabilities: fetch-pack: mention server version with verbose output parse_feature_request: make it easier to see feature values fetch-pack: do not ask for unadvertised capabilities do not send client agent unless server does first send-pack: fix capability-sending logic include agent identifier in capability string | 11 September 2012, 18:06:45 UTC |
| 2af6d98 | Junio C Hamano | 11 September 2012, 18:06:19 UTC | Merge branch 'jc/doc-git-updates' into maint * jc/doc-git-updates: Documentation: update the introductory section | 11 September 2012, 18:06:19 UTC |
| 1e51ae8 | Junio C Hamano | 11 September 2012, 18:06:14 UTC | Merge branch 'jk/check-docs-update' into maint * jk/check-docs-update: check-docs: get documented command list from Makefile check-docs: drop git-help special-case check-docs: list git-gui as a command check-docs: factor out command-list command-list: mention git-credential-* helpers command-list: add git-sh-i18n check-docs: update non-command documentation list check-docs: mention gitweb specially | 11 September 2012, 18:06:14 UTC |
| 738c218 | Junio C Hamano | 11 September 2012, 17:53:40 UTC | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 * tr/void-diff-setup-done: diff_setup_done(): return void | 11 September 2012, 17:53:40 UTC |
| 3f83594 | Junio C Hamano | 11 September 2012, 17:53:31 UTC | Merge branch 'tr/merge-recursive-flush' into maint-1.7.11 * tr/merge-recursive-flush: merge-recursive: eliminate flush_buffer() in favor of write_in_full() | 11 September 2012, 17:53:31 UTC |
| d8ce800 | Junio C Hamano | 11 September 2012, 17:53:21 UTC | Merge branch 'nd/index-errno' into maint-1.7.11 * nd/index-errno: read_index_from: remove bogus errno assignments | 11 September 2012, 17:53:21 UTC |
| 10a32fa | Junio C Hamano | 11 September 2012, 17:53:11 UTC | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 * pg/maint-apply-remove-unused-variable: apply: delete unused deflate_origlen from patch struct | 11 September 2012, 17:53:11 UTC |
| 6508d03 | Junio C Hamano | 11 September 2012, 17:51:58 UTC | Merge branch 'jc/test-prereq' into maint * jc/test-prereq: t3910: use the UTF8_NFD_TO_NFC test prereq test-lib: provide UTF8 behaviour as a prerequisite t0050: use the SYMLINKS test prereq t0050: use the CASE_INSENSITIVE_FS test prereq test-lib: provide case insensitivity as a prerequisite test: allow prerequisite to be evaluated lazily test: rename $satisfied to $satisfied_prereq | 11 September 2012, 17:51:58 UTC |
| bdee397 | David Gould | 11 September 2012, 14:32:47 UTC | run-command.c: fix broken list iteration in clear_child_for_cleanup Iterate through children_to_clean using 'next' fields but with an extra level of indirection. This allows us to update the chain when we remove a child and saves us managing several variables around the loop mechanism. Signed-off-by: David Gould <david@optimisefitness.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 17:30:31 UTC |
| ffcabcc | Junio C Hamano | 10 September 2012, 23:30:20 UTC | blame $path: avoid getting fooled by case insensitive filesystems "git blame MAKEFILE" run in a history that has "Makefile" but not MAKEFILE can get confused on a case insensitive filesystem, because the check we run to see if there is a corresponding file in the working tree with lstat("MAKEFILE") succeeds. In addition to that check, we have to make sure that the given path also exists in the commit we start digging history from (i.e. "HEAD"). Note that this reveals the breakage in a test added in cd8ae20 (git-blame shouldn't crash if run in an unmerged tree, 2007-10-18), which expects the entire merge-in-progress path to be blamed to the working tree when it did not exist in our tree. As it is clear in the log message of that commit, the old breakage was that it was causing an internal error and the fix was about avoiding it. Just check that the command does not die an uncontrolled death. For this particular case, the blame should fail, as the history for the file in that contents has not been committed yet at the point in the test. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2012, 01:42:30 UTC |
| 23193cf | Junio C Hamano | 10 September 2012, 22:39:15 UTC | Start preparing for 1.7.12.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2012, 22:39:15 UTC |
| f56d036 | Junio C Hamano | 10 September 2012, 22:37:37 UTC | Merge branch 'bc/prune-info' into maint "git prune" without "-v" used to warn about leftover temporary files (which is an indication of an earlier aborted operation). * bc/prune-info: prune.c: only print informational message in show_only or verbose mode | 10 September 2012, 22:37:37 UTC |
| e3f2675 | Junio C Hamano | 10 September 2012, 22:31:06 UTC | Merge branch 'maint-1.7.11' into maint * maint-1.7.11: Almost 1.7.11.6 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO rebase -i: use full onto sha1 in reflog sh-setup: protect from exported IFS receive-pack: do not leak output from auto-gc to standard output t/t5400: demonstrate breakage caused by informational message from prune setup: clarify error messages for file/revisions ambiguity send-email: improve RFC2047 quote parsing fsck: detect null sha1 in tree entries do not write null sha1s to on-disk index diff: do not use null sha1 as a sentinel value | 10 September 2012, 22:31:06 UTC |
| 9a8eea9 | Junio C Hamano | 10 September 2012, 22:30:46 UTC | Almost 1.7.11.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2012, 22:30:46 UTC |
| 73eb89e | Junio C Hamano | 10 September 2012, 22:26:03 UTC | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11 The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog | 10 September 2012, 22:26:03 UTC |
| 7cc51cf | Junio C Hamano | 10 September 2012, 22:25:45 UTC | Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11 When the user exports a non-default IFS without HT, scripts that rely on being able to parse "ls-files -s | while read a b c..." start to fail. Protect them from such a misconfiguration. * jc/maint-protect-sh-from-ifs: sh-setup: protect from exported IFS | 10 September 2012, 22:25:45 UTC |
| 3f66463 | Junio C Hamano | 10 September 2012, 22:25:09 UTC | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11 When "git push" triggered the automatic gc on the receiving end, a message from "git prune" that said it was removing cruft leaked to the standard output, breaking the communication protocol. * bc/receive-pack-stdout-protection: receive-pack: do not leak output from auto-gc to standard output t/t5400: demonstrate breakage caused by informational message from prune | 10 September 2012, 22:25:09 UTC |
| 03adeea | Junio C Hamano | 10 September 2012, 22:24:53 UTC | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 "git diff" had a confusion between taking data from a path in the working tree and taking data from an object that happens to have name 0{40} recorded in a tree. * jk/maint-null-in-trees: fsck: detect null sha1 in tree entries do not write null sha1s to on-disk index diff: do not use null sha1 as a sentinel value | 10 September 2012, 22:24:54 UTC |
