| c16df57 | Junio C Hamano | 23 March 2012, 21:50:23 UTC | Git 1.7.10-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2012, 22:11:24 UTC |
| eb2c67c | Junio C Hamano | 23 March 2012, 21:40:39 UTC | .mailmap: unify various old mail addresses of gitster "git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2012, 21:40:39 UTC |
| f47ff5a | Junio C Hamano | 23 March 2012, 21:36:21 UTC | Merge branch 'am/completion-zsh-fix' * am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh | 23 March 2012, 21:36:21 UTC |
| 0df81d8 | Junio C Hamano | 23 March 2012, 21:36:13 UTC | Merge branch 'dw/gitweb-doc-grammo' Typofix. * dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes | 23 March 2012, 21:36:13 UTC |
| c32c959 | D Waitzman | 23 March 2012, 15:02:43 UTC | Documentation/gitweb: trivial English fixes Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman <djw@bbn.com> | 23 March 2012, 18:22:04 UTC |
| 471dcfd | Alex Merry | 01 September 2011, 13:47:31 UTC | contrib/completion: "local var=()" is misinterpreted as func-decl by zsh Certain versions of zsh seems to treat local var=() as a function declaration, rather than an assignment of an empty array, although its documentation does not suggest that this should be the case. With zsh 4.3.15 on Fedora Core 15, this causes __git_ps1 " (%s)" to trigger an error message: local:2: command not found: svn_url_pattern when GIT_PS1_SHOWUPSTREAM="auto". Signed-off-by: Alex Merry <dev@randomguy3.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2012, 17:02:39 UTC |
| 498a04a | Junio C Hamano | 20 March 2012, 22:54:28 UTC | Merge branch 'maint' * maint: | 20 March 2012, 22:54:28 UTC |
| 0f36076 | Junio C Hamano | 20 March 2012, 22:53:30 UTC | Merge branch 'maint-1.7.8' into maint * maint-1.7.8: t/Makefile: Use $(sort ...) explicitly where needed gitweb: Fix actionless dispatch for non-existent objects i18n of multi-line advice messages | 20 March 2012, 22:53:30 UTC |
| d4c813d | Junio C Hamano | 20 March 2012, 22:26:19 UTC | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 * ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed | 20 March 2012, 22:26:19 UTC |
| 39af789 | Junio C Hamano | 20 March 2012, 22:25:38 UTC | Merge branch 'jc/advise-i18n' into maint-1.7.8 * jc/advise-i18n: i18n of multi-line advice messages | 20 March 2012, 22:25:38 UTC |
| bd193f4 | Junio C Hamano | 20 March 2012, 22:24:23 UTC | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 * jn/gitweb-unspecified-action: gitweb: Fix actionless dispatch for non-existent objects | 20 March 2012, 22:24:23 UTC |
| f524129 | Junio C Hamano | 16 March 2012, 16:16:17 UTC | Merge branch 'ab/perl-i18n' * ab/perl-i18n: perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER Git::I18N: compatibility with perl <5.8.3 | 16 March 2012, 16:16:17 UTC |
| 5eb660e | Ævar Arnfjörð Bjarmason | 10 March 2012, 12:29:35 UTC | perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was set. Change the generation of the fallback perl.mak file to do that. Now Git/I18N.pm is installed alongside Git.pm in such a way that anything that uses GITPERLLIB will find it. Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2012, 16:15:28 UTC |
| bc62ca1 | Junio C Hamano | 16 March 2012, 15:42:22 UTC | Update draft release notes to 1.7.10 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2012, 15:42:22 UTC |
| 0987145 | Junio C Hamano | 16 March 2012, 15:24:19 UTC | Merge branch 'th/mergetools-deltawalker' * th/mergetools-deltawalker: Documentation/difftool: add deltawalker to list of valid diff tools | 16 March 2012, 15:24:20 UTC |
| c3117b2 | Junio C Hamano | 16 March 2012, 15:23:53 UTC | Merge branch 'jc/maint-verify-objects-remove-pessimism' The code to validate the history connectivity between old refs and new refs used by fetch and receive-pack, introduced in 1.7.8, was grossly inefficient and unnecessarily tried to re-validate integrity of individual objects. This essentially reverts that performance regression. * jc/maint-verify-objects-remove-pessimism: fetch/receive: remove over-pessimistic connectivity check | 16 March 2012, 15:23:53 UTC |
| 9721d2f | Junio C Hamano | 16 March 2012, 15:23:34 UTC | Merge branch 'sl/customize-sane-tool-path' * sl/customize-sane-tool-path: configure: allow user to prevent $PATH "sanitization" on Solaris | 16 March 2012, 15:23:35 UTC |
| 5087aac | Junio C Hamano | 16 March 2012, 15:19:18 UTC | Merge "two fixes for fast-import's 'ls' command" from Jonathan Andrew Sayers noticed that the svn-fe | git fast-import pipeline mishandles a subversion history that copies the root directory to a sub-directory (e.g. doing `svn cp . trunk` to standardise your layout). As David Barr explained, the bug arises when the following command is sent to git fast-import: 'ls' SP ':1' SP LF Instead of reading back what is at the root of r1, it unconditionally reports the path as missing. After sleeping on it, here are two patches for 'maint'. One plugs a memory leak. The other ensures that trying to pass an empty path to the 'ls' command results in an error message that can help the frontend author instead of the silently broken conversion Andrew found. Then we can carefully add 'ls ""' support in 1.7.11. * commit 'refs/pull-request-tags/jn/maint-fast-import-empty-ls': fast-import: don't allow 'ls' of path with empty components fast-import: leakfix for 'ls' of dirty trees | 16 March 2012, 15:19:18 UTC |
| a99c5e5 | Junio C Hamano | 16 March 2012, 04:54:42 UTC | Merge branch 'th/git-diffall' * th/git-diffall: contrib/diffall: fix cleanup trap on Windows contrib/diffall: eliminate duplicate while loops contrib/diffall: eliminate use of tar contrib/diffall: create tmp dirs without mktemp contrib/diffall: comment actual reason for 'cdup' | 16 March 2012, 04:54:42 UTC |
| c58499c | Junio C Hamano | 16 March 2012, 04:54:30 UTC | Merge branch 'th/doc-diff-submodule-option' * th/doc-diff-submodule-option: Documentation/diff-options: reword description of --submodule option | 16 March 2012, 04:54:31 UTC |
| d21c463 | Junio C Hamano | 15 March 2012, 21:57:02 UTC | fetch/receive: remove over-pessimistic connectivity check Git 1.7.8 introduced an object and history re-validation step after "fetch" or "push" causes new history to be added to a receiving repository. This is to protect a malicious server or pushing client from corrupting the repository by taking advantage of an existing corrupt object that is unconnected to existing history. But this check is way over-pessimistic. During "fetch" or "receive-pack" (the server side of "push"), unpack-objects and index-pack already validate individual objects that are received, and the only thing we would want to catch are corrupted objects that already happen to exist in our repository but are not referenced from our refs. Such objects must have been written by an earlier run of our codepaths that write out loose objects or packfiles, and they must have done the validation of individual objects when they did so. The only thing left to worry about is the connectivity integrity, which can be checked with "rev-list --objects", which is much cheaper. We have been paying the 5x to 8x runtime overhead the --verify-objects often adds for no real gain. Revert check_everything_connected() not to use this over-pessimistic check. Credit goes to Nguyễn Thái Ngọc Duy, who originally identified the performance regression and endured multiple rounds of reviews to fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2012, 22:23:17 UTC |
| 79e0fe6 | Tim Henigan | 15 March 2012, 16:28:26 UTC | Documentation/difftool: add deltawalker to list of valid diff tools deltawalker has been supported since 284a126c3ef3, but was not added to the list of valid diff tools reported by 'git difftool --help'. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2012, 20:53:39 UTC |
| 0e2d57f | Junio C Hamano | 14 March 2012, 22:38:47 UTC | Git 1.7.10-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:47:45 UTC |
| bfe392e | Tim Henigan | 14 March 2012, 16:38:06 UTC | contrib/diffall: fix cleanup trap on Windows Prior to this commit, the cleanup trap that removes the tmp dir created by the script would fail on Windows. The error was silently ignored by the script. On Windows, a directory cannot be removed while it is the working directory of the process (thanks to Johannes Sixt on the Git list for this info [1]). This commit eliminates the 'cd' into the tmp directory that caused the error. [1]: http://article.gmane.org/gmane.comp.version-control.git/193086 Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:22:38 UTC |
| 9754908 | Tim Henigan | 14 March 2012, 16:38:05 UTC | contrib/diffall: eliminate duplicate while loops There were 3 instances of a 'while read; do' that used identical logic to populate '/tmp/right_dir'. This commit groups them into a single loop. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:22:08 UTC |
| e33e01d | Tim Henigan | 14 March 2012, 16:38:04 UTC | contrib/diffall: eliminate use of tar The 'tar' utility is not available on all platforms (some only support 'gnutar'). An earlier commit created a work-around for this problem, but a better solution is to eliminate the use of 'tar' completely. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:20:25 UTC |
| c5770f7 | Tim Henigan | 14 March 2012, 16:38:03 UTC | contrib/diffall: create tmp dirs without mktemp mktemp is not available on all platforms. Instead of littering the code with a work-around, this commit replaces mktemp with a one-line Perl script. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:20:21 UTC |
| a22a947 | Tim Henigan | 14 March 2012, 16:38:02 UTC | contrib/diffall: comment actual reason for 'cdup' The comment from an earlier commit did not reflect the actual reason this operation is needed. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 22:19:55 UTC |
| 3fe271e | Tim Henigan | 14 March 2012, 17:00:55 UTC | Documentation/diff-options: reword description of --submodule option The previous description was confusing. This rewrite makes it easier to understand. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2012, 19:15:46 UTC |
| d973dc0 | Junio C Hamano | 13 March 2012, 19:36:28 UTC | Merge branch 'jc/i18n-shell-script-gettext' The auto detection was testing if a fixed string that is known to be non-empty is empty by mistake. * jc/i18n-shell-script-gettext: i18n: fix auto detection of gettext scheme for shell scripts | 13 March 2012, 19:36:28 UTC |
| 8de55e3 | Junio C Hamano | 13 March 2012, 19:36:09 UTC | Merge branch 'jc/maint-undefined-i18n-observation-test' It was unclear what a test in t0204 wanted to check; it turns out that it was only to observe an undefined behaviour of the system, and did not anticipate one kind of reasonable error behaviour. * jc/maint-undefined-i18n-observation-test: t0204: clarify the "observe undefined behaviour" test | 13 March 2012, 19:36:09 UTC |
| 3f26309 | Junio C Hamano | 13 March 2012, 19:35:53 UTC | Merge branch 'ms/maint-config-error-at-eol-linecount' When "git config" diagnoses an error in a configuration file and shows the line number for the offending line, it miscounted if the error was at the end of line. By Martin Stenberg * ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number Conflicts: t/t1300-repo-config.sh | 13 March 2012, 19:35:53 UTC |
| 9d9bfea | Junio C Hamano | 13 March 2012, 19:35:22 UTC | Merge branch 'ph/rerere-doc' By Phil Hord * ph/rerere-doc: rerere: Document 'rerere remaining' | 13 March 2012, 19:35:22 UTC |
| 6c15a1c | Junio C Hamano | 13 March 2012, 18:38:27 UTC | am: officially deprecate -b/--binary option We have had these options as harmless no-op for more than 3 years without officially deprecating them. Let's announce the deprecation and start warning against their use, but without failing the command just not yet, so that we can later repurpose the option if we want to in the future. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2012, 19:21:04 UTC |
| fa678fe | Junio C Hamano | 12 March 2012, 22:59:06 UTC | Update draft release notes to 1.7.10 before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2012, 22:59:06 UTC |
| 57cec0a | Junio C Hamano | 12 March 2012, 22:55:53 UTC | Merge branch 'az/verify-tag-use-gpg-config' "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. By Alex Zepeda * az/verify-tag-use-gpg-config: verify-tag: Parse GPG configuration options. | 12 March 2012, 22:55:54 UTC |
| 3101a74 | Junio C Hamano | 12 March 2012, 22:54:21 UTC | Sync with 1.7.9.4 | 12 March 2012, 22:54:21 UTC |
| a460348 | Junio C Hamano | 12 March 2012, 22:52:52 UTC | Git 1.7.9.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2012, 22:52:52 UTC |
| 92b7aac | Junio C Hamano | 12 March 2012, 22:46:53 UTC | Merge branch 'tr/maint-bundle-boundary' into maint "git bundle" did not record boundary commits correctly when there are many of them. By Thomas Rast * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion | 12 March 2012, 22:46:54 UTC |
| fce8b5d | Junio C Hamano | 12 March 2012, 22:46:32 UTC | Merge branch 'jc/maint-diff-patch-header' into maint "git diff-index" and its friends at the plumbing level showed the "diff --git" header and nothing else for a path whose cached stat info is dirty without actual difference when asked to produce a patch. This was a longstanding bug that we could have fixed long time ago. By Junio C Hamano * jc/maint-diff-patch-header: diff -p: squelch "diff --git" header for stat-dirty paths t4011: illustrate "diff-index -p" on stat-dirty paths t4011: modernise style | 12 March 2012, 22:46:32 UTC |
| f629c23 | Junio C Hamano | 12 March 2012, 22:45:57 UTC | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint "gitweb" did use quotemeta() to prepare search string when asked to do a fixed-string project search, but did not use it by mistake and used the user-supplied string instead. By Jakub Narebski * jn/maint-do-not-match-with-unsanitized-searchtext: gitweb: Fix fixed string (non-regexp) project search | 12 March 2012, 22:45:58 UTC |
| b91a13b | Junio C Hamano | 12 March 2012, 22:43:06 UTC | Merge branch 'jc/am-3-nonstandard-popt' into maint The code to synthesize the fake ancestor tree used by 3-way merge fallback in "git am" was not prepared to read a patch created with a non-standard -p<num> value. * jc/am-3-nonstandard-popt: test: "am -3" can accept non-standard -p<num> am -3: allow nonstandard -p<num> option | 12 March 2012, 22:43:15 UTC |
| 4eeb1de | Thomas Rast | 12 March 2012, 21:47:19 UTC | git-am: error out when seeing -b/--binary The --binary option to git-apply has been a no-op since 2b6eef9 (Make apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160 (git-am: ignore --binary option, 2008-08-09). We could remove it outright, but let's be nice to people who still have scripts saying 'git am -b' (if they exist) and tell them the reason for the sudden failure. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2012, 21:57:37 UTC |
| ac06116 | Junio C Hamano | 12 March 2012, 21:41:15 UTC | i18n: fix auto detection of gettext scheme for shell scripts A new code added by ad17ea7 (add a Makefile switch to avoid gettext translation in shell scripts, 2012-01-23) tried to optionally force a gettext scheme to "fallthrough", but ended up forcing it to everybody. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2012, 21:41:15 UTC |
| 4b34059 | Martin Stenberg | 09 March 2012, 21:57:54 UTC | config: report errors at the EOL with correct line number A section in a config file with a missing "]" reports the next line as bad, same goes to a value with a missing end quote. This happens because the error is not detected until the end of the line, when line number is already increased. Fix this by decreasing line number by one for these cases. Signed-off-by: Martin Stenberg <martin@gnutiken.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2012, 16:39:06 UTC |
| b8de3f4 | Junio C Hamano | 12 March 2012, 16:03:20 UTC | Merge https://github.com/git-l10n/git-po Updates to localized messages for zn_CN and sv locales. via Jiang Xin * https://github.com/git-l10n/git-po: l10n: Improve zh_CN translation for msg "not something we can merge" l10n: Improve zh_CN trans for msg that cannot fast-forward l10n: Update zh_CN translation for 1.7.10-rc0 Update Swedish translation (732t0f0u). po/sv.po: add Swedish translation l10n: Update git.pot (1 new message) l10n: Update zh_CN translation for 1.7.9.2 l10n: Improve commit msg for zh_CN translation l10n: Improve zh_CN translation for msg that make empty commit when amend. l10n: Improve zh_CN translation for empty cherry-pick msg. l10n: Improve zh_CN translation for msg about branch deletion deny l10n: Improve zh_CN translation for lines insertion and deletion. | 12 March 2012, 16:03:20 UTC |
| 3e9c6a0 | Ævar Arnfjörð Bjarmason | 10 March 2012, 12:29:34 UTC | Git::I18N: compatibility with perl <5.8.3 Change the Exporter invocation in Git::I18N to be compatible with 5.8.0 to 5.8.2 inclusive. Before Exporter 5.57 (released with 5.8.3) Exporter didn't export the 'import' subroutine. Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2012, 21:25:41 UTC |
| 178e1de | Jonathan Nieder | 10 March 2012, 04:07:22 UTC | fast-import: don't allow 'ls' of path with empty components As the fast-import manual explains: The value of <path> must be in canonical form. That is it must not: . contain an empty directory component (e.g. foo//bar is invalid), . end with a directory separator (e.g. foo/ is invalid), . start with a directory separator (e.g. /foo is invalid), Unfortunately the "ls" command accepts these invalid syntaxes and responds by declaring that the indicated path is missing. This is too subtle and causes importers to silently misbehave; better to error out so the operator knows what's happening. The C, R, and M commands already error out for such paths. Reported-by: Andrew Sayers <andrew-git@pileofstuff.org> Analysis-by: David Barr <davidbarr@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> | 10 March 2012, 04:07:22 UTC |
| c27e559 | Jonathan Nieder | 10 March 2012, 03:20:34 UTC | fast-import: leakfix for 'ls' of dirty trees When the chosen directory has changed since it was last written to pack, "tree_content_get" makes a deep copy of its content to scribble on while computing the tree name, which we forgot to free. This leak has been present since the 'ls' command was introduced in v1.7.5-rc0~3^2~33 (fast-import: add 'ls' command, 2010-12-02). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> | 10 March 2012, 04:02:44 UTC |
| 9b9f46f | Junio C Hamano | 07 March 2012, 23:36:59 UTC | t0204: clarify the "observe undefined behaviour" test This test asks for an impossible conversion to the system by preparing an UTF-8 translation with characters that cannot be expressed in ISO-8859-1, and then asking the message shown in ISO-8859-1. Even though the behaviour against such a request is undefined, it may be interesting to see what the system does, and the purpose of this test is to see if there are platforms that exhibit behaviour that we haven't seen. The original recognized two known modes of behaviour: - the key used to query the message catalog ("TEST: Old English Runes"), saying "I cannot do that i18n". - impossible characters replaced with ASCII "?", saying "I punt". but they were treated totally differently. The test simply issued an informational message "Your system punts on this one" for the first error mode, while it diagnosed the latter as "Your system is good; you pass!". It turns out that Mac OS X exhibits a third mode of error behaviour, to spew out the raw value stored in the message catalog. The test diagnosed this behaviour as "broken", but it is merely trying to do its best to respond to an impossible request by saying "I punt" in a way that is slightly different from the second one. Update the offending test to make it clear what is (and is not) being tested, update the code structure so that newly discovered error mode can easily be added to it later, and reword the message that comes from a failing case to clarify that it is not the system that is broken when it fails, but merely that the behaviour is not something we have seen. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2012, 22:29:37 UTC |
| 2136394 | Stefano Lattarini | 09 March 2012, 12:43:55 UTC | configure: allow user to prevent $PATH "sanitization" on Solaris On a Solaris 10 system with Solaris make installed as '/usr/xpg4/bin/make', GNU make installed as '/usr/local/bin/make', and with '/usr/local/bin' appearing in $PATH *before* '/usr/xpg4/bin', I was seeing errors like this upon invoking "make all": Usage : make [ -f makefile ][ -K statefile ]... make: Fatal error: Unknown option `-C' This happenes because the Git's Makefile, when running on Solaris, automatically "sanitizes" $PATH by prepending '/usr/xpg6/bin' and '/usr/xpg4/bin' to it in order to avoid using non-POSIX /bin/sh from being used. In the setup described above, however, this has an unintended consequence of forcing the use of Solaris make in recursive make invocations -- even if the $(MAKE) macro is being correctly used in them! When building without using the autoconf machinery, this can be solved by overriding $(SANE_TOOL_PATH). Teach the autoconf machinery to also allow users of ./configure to override it from the command line with a new --with-sane-tool-path option. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2012, 19:39:51 UTC |
| 745950c | Thomas Rast | 09 March 2012, 09:52:54 UTC | p4000: use -3000 when promising -3000 The 'log -3000 (baseline)' test accidentally still used -1000 from an earlier version. Noticed-by: Lawrence Holding <Lawrence.Holding@cubic.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2012, 10:07:23 UTC |
| 3e7a1df | Phil Hord | 08 March 2012, 21:08:50 UTC | rerere: Document 'rerere remaining' This adds the 'remaining' command to the documentation of 'git rerere'. This command was added in ac49f5ca (Feb 16 2011; Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but it was never documented. Touch up the other rerere commands to reduce noise. First noticed by Vincent van Ravesteijn. Signed-off-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 22:40:44 UTC |
| a2c2506 | Alex Zepeda | 08 March 2012, 20:07:20 UTC | verify-tag: Parse GPG configuration options. Modify verify-tag to load relevant GPG variables from the git configuratio file. This allows git tag -v to use an alternative GPG binary in the same way that git tag -s does. Signed-off-by: Alex Zepeda <alex@inferiorhumanorgans.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 22:03:07 UTC |
| 42e52e3 | Junio C Hamano | 08 March 2012, 21:08:26 UTC | Update draft release notes to 1.7.10 Also apply typofixes people on the list helped spotting and correcting. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 21:08:54 UTC |
| 9a4c97e | Junio C Hamano | 08 March 2012, 21:05:04 UTC | Merge branch 'kb/maint-prune-rmdir-closedir' By Karsten Blees * kb/maint-prune-rmdir-closedir: fix deletion of .git/objects sub-directories in git-prune/repack | 08 March 2012, 21:05:04 UTC |
| 7ac6609 | Junio C Hamano | 08 March 2012, 21:04:52 UTC | Merge branch 'jl/maint-submodule-relative' By Jens Lehmann (3) and Johannes Sixt (1) * jl/maint-submodule-relative: submodules: fix ambiguous absolute paths under Windows submodules: refactor computation of relative gitdir path submodules: always use a relative path from gitdir to work tree submodules: always use a relative path to gitdir | 08 March 2012, 21:04:52 UTC |
| aa145bf | Junio C Hamano | 08 March 2012, 21:04:49 UTC | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' By Jakub Narebski * jn/maint-do-not-match-with-unsanitized-searchtext: gitweb: Fix fixed string (non-regexp) project search Conflicts: gitweb/gitweb.perl | 08 March 2012, 21:04:49 UTC |
| 2c54517 | Junio C Hamano | 08 March 2012, 21:04:44 UTC | Merge branch 'vr/branch-doc' By Vincent van Ravesteijn * vr/branch-doc: Documentation/git-branch: add default for --contains Documentation/git-branch: fix a typo Documentation/git-branch: cleanups | 08 March 2012, 21:04:44 UTC |
| 561ae06 | Thomas Rast | 08 March 2012, 08:54:55 UTC | perf: export some important test-lib variables The only bug right now is that $GIT_TEST_CMP is needed for test_cmp to work. However, we also export the three most important paths for tests: TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR Since they are available within test_expect_success, a future test writer may expect them to also be defined in test_perf. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 20:07:50 UTC |
| 1cbc324 | Thomas Rast | 08 March 2012, 08:54:54 UTC | perf: load test-lib-functions from the correct directory Loading it in the subshells still referred to $TEST_DIRECTORY/.., which was only correct in preliminary versions of perf-lib.sh Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 19:38:09 UTC |
| 6672dc8 | Thynson | 03 March 2012, 01:03:27 UTC | l10n: Improve zh_CN translation for msg "not something we can merge" Signed-off-by: Thynson <lanxingcan@gmail.com> | 08 March 2012, 16:22:56 UTC |
| 1aabac6 | Thynson | 03 March 2012, 00:34:28 UTC | l10n: Improve zh_CN trans for msg that cannot fast-forward Signed-off-by: Thynson <lanxingcan@gmail.com> | 08 March 2012, 16:22:49 UTC |
| 14c8bce | Jiang Xin | 08 March 2012, 04:06:53 UTC | l10n: Update zh_CN translation for 1.7.10-rc0 Translate 1 new message from Git 1.7.10-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 08 March 2012, 12:55:37 UTC |
| 6874b9e | Peter Krefting | 08 March 2012, 09:56:37 UTC | Update Swedish translation (732t0f0u). This update includes a replay of some review fixes from the initial translation run in 2010, which I cannot find having committed anywhere. Add myself to the po/TEAMS file as well. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 08 March 2012, 09:56:37 UTC |
| 0eb8fa3 | Peter Krefting | 12 September 2010, 20:10:21 UTC | po/sv.po: add Swedish translation Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> (cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b) | 08 March 2012, 08:28:35 UTC |
| 2b911f8 | Jiang Xin | 08 March 2012, 02:20:20 UTC | l10n: Update git.pot (1 new message) Update file 'po/git.pot' to v1.7.10-rc0: * Add 1 new l10n string in the new generated "git.pot" file at line: 191 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 08 March 2012, 02:20:20 UTC |
| 13ef396 | Jiang Xin | 08 March 2012, 02:17:21 UTC | Merge v1.7.10-rc0 for git l10n update | 08 March 2012, 02:17:21 UTC |
| 56a33c8 | Junio C Hamano | 07 March 2012, 20:51:55 UTC | Git 1.7.10-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2012, 20:51:55 UTC |
| 1e4d087 | Junio C Hamano | 07 March 2012, 20:12:59 UTC | Merge branch 'jc/pickaxe-ignore-case' By Junio C Hamano (2) and Ramsay Jones (1) * jc/pickaxe-ignore-case: ctype.c: Fix a sparse warning pickaxe: allow -i to search in patch case-insensitively grep: use static trans-case table | 07 March 2012, 20:12:59 UTC |
| d34e70d | Karsten Blees | 06 March 2012, 09:18:41 UTC | fix deletion of .git/objects sub-directories in git-prune/repack Both git-prune and git-repack (and thus, git-gc) try to rmdir while holding a DIR* handle on the directory. This can leave dangling empty directories in the .git/objects on platforms where directory cannot be removed while they are open. First call closedir() and then rmdir(); that is more logical ordering. Reported-by: John Chen <john0312@gmail.com> Reported-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Karsten Blees <blees@dcon.de> Improved-and-Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2012, 18:24:33 UTC |
| 713194c | Junio C Hamano | 06 March 2012, 22:53:07 UTC | Merge branch 'jh/threadable-symlink-check' By Jared Hance * jh/threadable-symlink-check: Add threaded versions of functions in symlinks.c. | 06 March 2012, 22:53:07 UTC |
| 239d6ed | Junio C Hamano | 06 March 2012, 22:53:07 UTC | Merge branch 'jc/maint-diff-patch-header' By Junio C Hamano * jc/maint-diff-patch-header: diff -p: squelch "diff --git" header for stat-dirty paths t4011: illustrate "diff-index -p" on stat-dirty paths t4011: modernise style | 06 March 2012, 22:53:07 UTC |
| f4464a3 | Junio C Hamano | 06 March 2012, 22:53:07 UTC | Merge branch 'th/mergetools-deltawalker' By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker | 06 March 2012, 22:53:07 UTC |
| 4b4ec3f | Junio C Hamano | 06 March 2012, 22:53:06 UTC | Merge branch 'cn/pull-rebase-message' By Carlos Martín Nieto * cn/pull-rebase-message: Make git-{pull,rebase} message without tracking information friendlier | 06 March 2012, 22:53:06 UTC |
| 2917e22 | Junio C Hamano | 06 March 2012, 22:53:06 UTC | Merge branch 'sl/modern-t0000' By Stefano Lattarini * sl/modern-t0000: t0000: modernise style | 06 March 2012, 22:53:06 UTC |
| dce89cb | Junio C Hamano | 06 March 2012, 22:53:06 UTC | Merge branch 'nl/http-proxy-auth' By Nelson Benitez Leon * nl/http-proxy-auth: http: support proxies that require authentication | 06 March 2012, 22:53:06 UTC |
| 4ebed61 | Junio C Hamano | 06 March 2012, 22:53:06 UTC | Merge branch 'tr/maint-bundle-boundary' By Thomas Rast * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion | 06 March 2012, 22:53:06 UTC |
| af05021 | Junio C Hamano | 06 March 2012, 22:53:06 UTC | Merge branch 'zj/diff-stat-dyncol' By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1) * zj/diff-stat-dyncol: : This breaks tests. Perhaps it is not worth using the decimal-width stuff : for this series, at least initially. diff --stat: add config option to limit graph width diff --stat: enable limiting of the graph part diff --stat: add a test for output with COLUMNS=40 diff --stat: use a maximum of 5/8 for the filename part merge --stat: use the full terminal width log --stat: use the full terminal width show --stat: use the full terminal width diff --stat: use the full terminal width diff --stat: tests for long filenames and big change counts | 06 March 2012, 22:53:06 UTC |
| 556c5e0 | Junio C Hamano | 06 March 2012, 22:53:02 UTC | Merge branch 'maint' By Thomas Rast * maint: t5704: fix nonportable sed/grep usages Document the --histogram diff option | 06 March 2012, 22:53:02 UTC |
| e65ceb6 | Jakub Narebski | 02 March 2012, 22:34:24 UTC | gitweb: Fix fixed string (non-regexp) project search Use $search_regexp, where regex metacharacters are quoted, for searching projects list, rather than $searchtext, which contains original search term. Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 22:48:24 UTC |
| 0dbe659 | Thomas Rast | 06 March 2012, 14:50:37 UTC | t5704: fix nonportable sed/grep usages OS X's sed and grep would complain with (respectively) sed: 1: "/^-/{p;q}": extra characters at the end of q command grep: Regular expression too big For sed, use an explicit ; to terminate the q command. For grep, spell the "40 hex digits" explicitly in the regex, which should be safe as other tests already use this and we haven't got breakage reports on OS X about them. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 20:32:24 UTC |
| 80a3f53 | Junio C Hamano | 06 March 2012, 20:05:09 UTC | Merge branch 'maint-1.7.8' into maint By Thomas Rast * maint-1.7.8: Document the --histogram diff option | 06 March 2012, 20:05:09 UTC |
| e521850 | Junio C Hamano | 06 March 2012, 20:04:48 UTC | Merge branch 'maint-1.7.7' into maint-1.7.8 By Thomas Rast * maint-1.7.7: Document the --histogram diff option | 06 March 2012, 20:04:48 UTC |
| d909e07 | Thomas Rast | 06 March 2012, 13:15:02 UTC | Document the --histogram diff option Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:53:29 UTC |
| 8555123 | Thomas Rast | 06 March 2012, 13:15:01 UTC | perf: compare diff algorithms 8c912ee (teach --histogram to diff, 2011-07-12) claimed histogram diff was faster than both Myers and patience. We have since incorporated a performance testing framework, so add a test that compares the various diff tasks performed in a real 'log -p' workload. This does indeed show that histogram diff slightly beats Myers, while patience is much slower than the others. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:48:11 UTC |
| f36ed6d | Vincent van Ravesteijn | 06 March 2012, 09:32:45 UTC | Documentation/git-branch: add default for --contains Indicate that the commit parameter of --contains defaults to HEAD. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:43:23 UTC |
| ebab989 | Vincent van Ravesteijn | 06 March 2012, 09:32:44 UTC | Documentation/git-branch: fix a typo Fix a typo by replacing 'tag' with 'branch'. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:43:22 UTC |
| 3ea2232 | Vincent van Ravesteijn | 06 March 2012, 09:32:43 UTC | Documentation/git-branch: cleanups Most of the exact option strings to be typed by end users are already set in typewriter font by using `--option`, but a few places used '--option' to call for italics or with no quoting. Uniformly use `--option`. Also add a full-stop after a sentence that missed one. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:40:54 UTC |
| 2980b0d | Junio C Hamano | 05 March 2012, 22:29:50 UTC | Sync with 1.7.9.3 | 05 March 2012, 22:29:50 UTC |
| 69f4e08 | Junio C Hamano | 05 March 2012, 22:29:07 UTC | Git 1.7.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2012, 22:29:07 UTC |
| bb8cbe7 | Junio C Hamano | 05 March 2012, 22:28:14 UTC | Merge branch 'jc/doc-merge-options' into maint * jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together | 05 March 2012, 22:28:14 UTC |
| 0e20414 | Junio C Hamano | 05 March 2012, 22:27:36 UTC | Merge branch 'cn/maint-rev-list-doc' into maint * cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed | 05 March 2012, 22:27:36 UTC |
| a8747a1 | Junio C Hamano | 05 March 2012, 19:32:08 UTC | fsck doc: a minor typofix Reword the misspelled "squelch" noticed by Hermann Gaustere to say "omit", which would sit better anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2012, 19:32:19 UTC |
| a8ea1b7 | Thomas Rast | 05 March 2012, 13:48:49 UTC | fast-import: zero all of 'struct tag' to silence valgrind When running t9300, valgrind (correctly) complains about an uninitialized value in write_crash_report: ==2971== Use of uninitialised value of size 8 ==2971== at 0x4164F4: sha1_to_hex (hex.c:70) ==2971== by 0x4073E4: die_nicely (fast-import.c:468) ==2971== by 0x43284C: die (usage.c:86) ==2971== by 0x40420D: main (fast-import.c:2731) ==2971== Uninitialised value was created by a heap allocation ==2971== at 0x4C29B3D: malloc (vg_replace_malloc.c:263) ==2971== by 0x433645: xmalloc (wrapper.c:35) ==2971== by 0x405DF5: pool_alloc (fast-import.c:619) ==2971== by 0x407755: pool_calloc.constprop.14 (fast-import.c:634) ==2971== by 0x403F33: main (fast-import.c:3324) Fix this by zeroing all of the 'struct tag'. We would only need to zero out the 'sha1' field, but this way seems more future-proof. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2012, 17:36:09 UTC |
| 284a126 | Tim Henigan | 05 March 2012, 14:28:07 UTC | mergetools: add a plug-in to support DeltaWalker DeltaWalker is a non-free tool popular among some users. Add a plug-in to support it from difftool and mergetool. Note that the $(pwd)/ in front of $MERGED should not be necessary. However without it, DeltaWalker crashes with a JRE exception. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2012, 17:31:47 UTC |
| 4a92a17 | Junio C Hamano | 05 March 2012, 07:38:02 UTC | Update draft release notes to 1.7.10 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2012, 07:38:02 UTC |
| b8b5290 | Junio C Hamano | 05 March 2012, 07:35:23 UTC | Merge branch 'jk/symbolic-ref-short' * jk/symbolic-ref-short: symbolic-ref --short: abbreviate the output unambiguously | 05 March 2012, 07:35:23 UTC |
| 6759f95 | Junio C Hamano | 05 March 2012, 07:35:18 UTC | Merge branch 'jn/gitweb-hilite-regions' * jn/gitweb-hilite-regions: gitweb: Highlight matched part of shortened project description gitweb: Highlight matched part of project description when searching projects gitweb: Highlight matched part of project name when searching projects gitweb: Introduce esc_html_match_hl and esc_html_hl_regions | 05 March 2012, 07:35:18 UTC |
| 250f0a0 | Junio C Hamano | 05 March 2012, 07:35:12 UTC | Merge branch 'jc/am-3-nonstandard-popt' * jc/am-3-nonstandard-popt: test: "am -3" can accept non-standard -p<num> am -3: allow nonstandard -p<num> option | 05 March 2012, 07:35:12 UTC |
