From b91a8a3ee17629ca7b9806fede2937232a05116c Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 3 Mar 2010 21:34:31 +0100 Subject: [PATCH 1/4] git-svn: req_svn when needed The delayed loading of SVN missed a place where SVN::Core is used. Make sure to load the package before trying to use it. Signed-off-by: Michael J Gruber Acked-by: Eric Wong --- git-svn.perl | 1 + 1 file changed, 1 insertion(+) diff --git a/git-svn.perl b/git-svn.perl index b7c03b641c..bae7231096 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1102,6 +1102,7 @@ sub cmd_info { if ($@) { $result .= "Repository Root: (offline)\n"; } + ::_req_svn(); $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" && ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir"); $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n"; From 3acae29e81d6c1efb06b9c71e630f7f5543f1213 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 3 Mar 2010 21:34:32 +0100 Subject: [PATCH 2/4] t9119-git-svn-info.sh: test with svn 1.6.* as well All tests in t9119 were disabled for subversion versions other than 1.[45].*. Make the test script run with subversion 1.[456].*. Signed-off-by: Michael J Gruber Acked-by: Eric Wong --- t/t9119-git-svn-info.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh index 95741cbbac..a9a558d292 100755 --- a/t/t9119-git-svn-info.sh +++ b/t/t9119-git-svn-info.sh @@ -7,9 +7,10 @@ test_description='git svn info' . ./lib-git-svn.sh # Tested with: svn, version 1.4.4 (r25188) +# Tested with: svn, version 1.6.[12345689] v=`svn_cmd --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'` case $v in -1.[45].*) +1.[456].*) ;; *) say "skipping svn-info test (SVN version: $v not supported)" From 8024d5961bf885245d8febcb189a8c71bb46b29f Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 4 Mar 2010 13:08:28 +0100 Subject: [PATCH 3/4] Remove extra '-' from git-am(1) Signed-off-by: Michal Sojka Signed-off-by: Junio C Hamano --- Documentation/git-am.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 67ad5da9cc..40178be922 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -44,7 +44,7 @@ OPTIONS Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). ----no-scissors:: +--no-scissors:: Ignore scissors lines (see linkgit:git-mailinfo[1]). -q:: From 3609ad8ec204f337f6fe12b3487b57e0d40c0d88 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 4 Mar 2010 22:39:38 -0800 Subject: [PATCH 4/4] Update draft release notes to 1.7.0.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.0.2.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes-1.7.0.2.txt b/Documentation/RelNotes-1.7.0.2.txt index 5f8e156dcb..e44e010c11 100644 --- a/Documentation/RelNotes-1.7.0.2.txt +++ b/Documentation/RelNotes-1.7.0.2.txt @@ -4,19 +4,43 @@ Git v1.7.0.2 Release Notes Fixes since v1.7.0.1 -------------------- + * GIT_PAGER was not honored consistently by some scripted Porcelains, most + notably "git am". + + * updating working tree files after telling git to add them to the + index and while it is still working created garbage object files in + the repository without diagnosing it as an error. + + * "git bisect -- pathspec..." did not diagnose an error condition properly when + the simplification with given pathspec made the history empty. + + * "git rev-list --cherry-pick A...B" now has an obvious optimization when the + histories haven't diverged (i.e. when one end is an ancestor of the other). + + * "git diff --quiet -w" did not work as expected. + * "git fast-import" didn't work with a large input, as it lacked support for producing the pack index in v2 format. * "git imap-send" didn't use CRLF line endings over the imap protocol when storing its payload to the draft box, violating RFC 3501. + * "git log --format='%w(x,y,z)%b'" and friends that rewrap message + has been optimized for utf-8 payload. + * Error messages generated on the receiving end did not come back to "git push". + * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series + to speed up scanning of large working tree. + + * "gitweb" did not diagnose parsing errors properly while reading tis configuration + file. + And other minor fixes and documentation updates. --- exec >/var/tmp/1 -O=v1.7.0.1-28-gb46946a +O=v1.7.0.1-64-g7d18122 echo O=$(git describe maint) git shortlog --no-merges $O..maint