summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-13test: use test_i18ncmp when checking --stat outputLibravatar Jonathan Nieder8-16/+16
Ever since v1.7.9.2~13 (2012-02-01), git's diffstat-style summary line produced by "git apply --stat", "git diff --stat", and "git commit" varies by locale, producing test failures when GETTEXT_POISON is set. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-12Update draft release notes to 1.7.10 before -rc1Libravatar Junio C Hamano1-21/+12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-12Merge branch 'az/verify-tag-use-gpg-config'Libravatar Junio C Hamano1-1/+9
"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.
2012-03-12Sync with 1.7.9.4Libravatar Junio C Hamano2-1/+26
2012-03-12Git 1.7.9.4Libravatar Junio C Hamano4-3/+28
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-12Merge branch 'tr/maint-bundle-boundary' into maintLibravatar Junio C Hamano2-23/+36
"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
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintLibravatar Junio C Hamano2-86/+111
"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
2012-03-12Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintLibravatar Junio C Hamano1-8/+8
"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
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintLibravatar Junio C Hamano2-4/+22
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
2012-03-12git-am: error out when seeing -b/--binaryLibravatar Thomas Rast1-1/+3
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>
2012-03-12Merge https://github.com/git-l10n/git-poLibravatar Junio C Hamano4-358/+4239
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.
2012-03-09p4000: use -3000 when promising -3000Libravatar Thomas Rast1-1/+1
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>
2012-03-08verify-tag: Parse GPG configuration options.Libravatar Alex Zepeda1-1/+9
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>
2012-03-08Update draft release notes to 1.7.10Libravatar Junio C Hamano1-10/+28
Also apply typofixes people on the list helped spotting and correcting. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-08Merge branch 'kb/maint-prune-rmdir-closedir'Libravatar Junio C Hamano2-3/+3
By Karsten Blees * kb/maint-prune-rmdir-closedir: fix deletion of .git/objects sub-directories in git-prune/repack
2012-03-08Merge branch 'jl/maint-submodule-relative'Libravatar Junio C Hamano3-29/+68
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
2012-03-08Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'Libravatar Junio C Hamano1-9/+9
By Jakub Narebski * jn/maint-do-not-match-with-unsanitized-searchtext: gitweb: Fix fixed string (non-regexp) project search Conflicts: gitweb/gitweb.perl
2012-03-08Merge branch 'vr/branch-doc'Libravatar Junio C Hamano1-9/+10
By Vincent van Ravesteijn * vr/branch-doc: Documentation/git-branch: add default for --contains Documentation/git-branch: fix a typo Documentation/git-branch: cleanups
2012-03-08perf: export some important test-lib variablesLibravatar Thomas Rast2-1/+14
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>
2012-03-08perf: load test-lib-functions from the correct directoryLibravatar Thomas Rast2-1/+6
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>
2012-03-09l10n: Improve zh_CN translation for msg "not something we can merge"Libravatar Thynson1-1/+1
Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-09l10n: Improve zh_CN trans for msg that cannot fast-forwardLibravatar Thynson1-1/+1
Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-08l10n: Update zh_CN translation for 1.7.10-rc0Libravatar Jiang Xin1-169/+177
Translate 1 new message from Git 1.7.10-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-08Update Swedish translation (732t0f0u).Libravatar Peter Krefting2-1396/+1767
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>
2012-03-08po/sv.po: add Swedish translationLibravatar Peter Krefting1-0/+3492
Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> (cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b)
2012-03-08l10n: Update git.pot (1 new message)Libravatar Jiang Xin1-169/+175
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>
2012-03-08Merge v1.7.10-rc0 for git l10n updateLibravatar Jiang Xin72-683/+2034
2012-03-07Git 1.7.10-rc0Libravatar Junio C Hamano2-6/+58
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Libravatar Junio C Hamano7-10/+170
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
2012-03-07fix deletion of .git/objects sub-directories in git-prune/repackLibravatar Karsten Blees2-3/+3
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>
2012-03-06Merge branch 'jh/threadable-symlink-check'Libravatar Junio C Hamano2-2/+28
By Jared Hance * jh/threadable-symlink-check: Add threaded versions of functions in symlinks.c.
2012-03-06Merge branch 'jc/maint-diff-patch-header'Libravatar Junio C Hamano2-86/+111
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
2012-03-06Merge branch 'th/mergetools-deltawalker'Libravatar Junio C Hamano1-0/+21
By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker
2012-03-06Merge branch 'cn/pull-rebase-message'Libravatar Junio C Hamano4-29/+24
By Carlos Martín Nieto * cn/pull-rebase-message: Make git-{pull,rebase} message without tracking information friendlier
2012-03-06Merge branch 'sl/modern-t0000'Libravatar Junio C Hamano1-274/+289
By Stefano Lattarini * sl/modern-t0000: t0000: modernise style
2012-03-06Merge branch 'nl/http-proxy-auth'Libravatar Junio C Hamano1-1/+3
By Nelson Benitez Leon * nl/http-proxy-auth: http: support proxies that require authentication
2012-03-06Merge branch 'tr/maint-bundle-boundary'Libravatar Junio C Hamano2-23/+36
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
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano9-33/+335
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
2012-03-06Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
By Thomas Rast * maint: t5704: fix nonportable sed/grep usages Document the --histogram diff option
2012-03-06gitweb: Fix fixed string (non-regexp) project searchLibravatar Jakub Narebski1-8/+8
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>
2012-03-06t5704: fix nonportable sed/grep usagesLibravatar Thomas Rast1-2/+2
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>
2012-03-06Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano1-0/+3
By Thomas Rast * maint-1.7.8: Document the --histogram diff option
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Libravatar Junio C Hamano1-0/+3
By Thomas Rast * maint-1.7.7: Document the --histogram diff option
2012-03-06Document the --histogram diff optionLibravatar Thomas Rast1-0/+3
Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-06perf: compare diff algorithmsLibravatar Thomas Rast1-0/+29
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>
2012-03-06Documentation/git-branch: add default for --containsLibravatar Vincent van Ravesteijn1-2/+3
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>
2012-03-06Documentation/git-branch: fix a typoLibravatar Vincent van Ravesteijn1-1/+1
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>
2012-03-06Documentation/git-branch: cleanupsLibravatar Vincent van Ravesteijn1-6/+6
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>
2012-03-05Sync with 1.7.9.3Libravatar Junio C Hamano2-2/+3
2012-03-05Git 1.7.9.3Libravatar Junio C Hamano2-2/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 04:57:10 +0000