# [ANNOUNCE] Git 1.7.3.2 6 messages from 2010-10-22 to 2010-11-25. Participants: Junio C Hamano, Anders Kaseorg, Steven Walter, Eric Wong. Thread: https://gitlist.dev/t/25515 ## Junio C Hamano, 2010-10-22 04:13 Subject: [ANNOUNCE] Git 1.7.3.2 Message-ID: <7vwrparhjq.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vwrparhjq.fsf%40alter.siamese.dyndns.org ``` The latest maintenance release Git 1.7.3.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.3.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.3.2.tar.{gz,bz2} (preformatted docs) git-manpages-1.7.3.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.3.2-1.fc11.$arch.rpm (RPM) This is primarily to push out many documentation fixes accumulated since the 1.7.3.1 release. ---------------------------------------------------------------- Changes since v1.7.3.1 are as follows: Andreas Gruenbacher (1): Clarify and extend the "git diff" format documentation Antonio Ospite (1): t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' Bert Wesarg (1): Documentation: update-index: -z applies also to --index-info Brandon Casey (1): diffcore-pickaxe.c: remove unnecessary curly braces Cliff Frey (1): documentation: git-config minor cleanups Elijah Newren (1): t3020 (ls-files-error-unmatch): remove stray '1' from end of file Eric Wong (1): Documentation/git-svn: discourage "noMetadata" Erik Faye-Lund (1): do not depend on signed integer overflow Johannes Schindelin (2): Make sure that git_getpass() never returns NULL Fix typo in pack-objects' usage Jon Seymour (1): stash: simplify parsing fixes Jonathan Nieder (10): t0004 (unwritable files): simplify error handling environment.c: remove unused variable setup: make sure git dir path is in a permanent buffer init: plug tiny one-time memory leak xdiff: cast arguments for ctype functions to unsigned char Documentation: No argument of ALLOC_GROW should have side-effects Documentation: gitrevisions is in section 7 Documentation: diff can compare blobs Documentation: expand 'git diff' SEE ALSO section Documentation: update implicit "--no-index" behavior in "git diff" Junio C Hamano (4): MinGW: avoid collisions between "tags" and "TAGS" CodingGuidelines: reword parameter expansion section shell portability: no "export VAR=VAL" Git 1.7.3.2 Kevin Ballard (1): Update test script annotate-tests.sh to handle missing/extra authors Kirill Smelkov (1): user-manual: be consistent in illustrations to 'git rebase' Mathias Lafeldt (1): git-svn: fix processing of decorated commit hashes Matthieu Moy (1): diff: trivial fix for --output file error message Michael J Gruber (4): remote-helpers: build in platform independent directory user-manual: fix anchor name Finding-comments-With-given-Content rev-list-options: clarify --parents and --children git-show-ref.txt: clarify the pattern matching Ramkumar Ramachandra (1): SubmittingPatches: Document some extra tags used in commit messages René Scharfe (1): work around buggy S_ISxxx(m) implementations Steven Walter (1): git-svn: check_cherry_pick should exclude commits already in our history Tony Luck (1): Better advice on using topic branches for kernel development Uwe Kleine-König (1): Documentation/git-clone: describe --mirror more verbosely Yann Dirson (1): t/t3415: use && where applicable. Štěpán Němec (6): Use angles for placeholders consistently Fix odd markup in --diff-filter documentation Use parentheses and `...' where appropriate Remove stray quotes in --pretty and --format documentation Put a space between `<' and argument in pack-objects usage string Fix {update,checkout}-index usage strings ``` ## Anders Kaseorg, 2010-10-22 08:58 Subject: Test failure with old svn [Re: [ANNOUNCE] Git 1.7.3.2] Message-ID: <1287737937.3785.15.camel@balanced-tree> URL: https://gitlist.dev/e/1287737937.3785.15.camel%40balanced-tree In-Reply-To: <7vwrparhjq.fsf@alter.siamese.dyndns.org> ``` On Thu, 2010-10-21 at 21:13 -0700, Junio C Hamano wrote: > Steven Walter (1): > git-svn: check_cherry_pick should exclude commits already in our history The new test in this commit fails with Subversion 1.4 and below (for example, on Ubuntu 6.06 and 8.04), where ‘svn merge’ required at least two arguments. I’m guessing that with Subversion < 1.5, the test doesn’t make sense and should just be skipped. Anders *** t9157-git-svn-fetch-merge.sh *** Initialized empty Git repository in /build/buildd/git-1.7.3.2/t/trash directory.t9157-git-svn-fetch-merge/.git/ expecting success: svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd mkdir -m x "$svnrepo"/branches && svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && ( cd "$SVN_TREE" && touch foo && svn add foo && svn commit -m "initial commit" && svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && touch bar && svn add bar && svn commit -m x && svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 && svn switch "$svnrepo"/branches/branch1 && touch baz && svn add baz && svn commit -m x && svn switch "$svnrepo"/trunk && svn merge "$svnrepo"/branches/branch1 && svn commit -m "merge" && svn switch "$svnrepo"/branches/branch1 && svn commit -m x && svn switch "$svnrepo"/branches/branch2 && svn merge "$svnrepo"/branches/branch1 && svn commit -m "merge branch1" && svn switch "$svnrepo"/trunk && svn merge "$svnrepo"/branches/branch2 && svn resolved baz && svn commit -m "merge branch2" ) && rm -rf "$SVN_TREE" rm -rf "$SVN_TREE" Committed revision 1. Committed revision 2. Checked out revision 2. A foo Adding foo Transmitting file data . Committed revision 3. Committed revision 4. A bar Adding bar Transmitting file data . Committed revision 5. Committed revision 6. D bar Updated to revision 6. A baz Adding baz Transmitting file data . Committed revision 7. D baz A bar Updated to revision 7. svn: Not enough arguments provided; try 'svn help' for more info not ok - 1 initialize source svn repo ``` ## Steven Walter, 2010-10-23 01:55 Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Message-ID: <1287798958-22549-1-git-send-email-stevenrwalter@gmail.com> URL: https://gitlist.dev/e/1287798958-22549-1-git-send-email-stevenrwalter%40gmail.com In-Reply-To: <1287737937.3785.15.camel@balanced-tree> ``` Specify a revision range to "merge" and manually set the svn:mergeinfo property. --- t/t9157-git-svn-fetch-merge.sh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh index da582c5..424e1fa 100755 --- a/t/t9157-git-svn-fetch-merge.sh +++ b/t/t9157-git-svn-fetch-merge.sh @@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' ' svn add baz && svn commit -m x && svn switch "$svnrepo"/trunk && - svn merge "$svnrepo"/branches/branch1 && + svn merge -r3:7 "$svnrepo"/branches/branch1 && + svn propset svn:mergeinfo "/branches/branch1:4-7" . && svn commit -m "merge" && svn switch "$svnrepo"/branches/branch1 && svn commit -m x && svn switch "$svnrepo"/branches/branch2 && - svn merge "$svnrepo"/branches/branch1 && + svn merge -r3:8 "$svnrepo"/branches/branch1 && + svn propset svn:mergeinfo "/branches/branch1:4-8" . && svn commit -m "merge branch1" && svn switch "$svnrepo"/trunk && - svn merge "$svnrepo"/branches/branch2 && + svn merge -r5:9 "$svnrepo"/branches/branch2 && + svn propset svn:mergeinfo "/branches/branch1:4-8 +/branches/branch2:6-9" . && svn resolved baz && svn commit -m "merge branch2" ) && -- 1.6.3.3 ``` ## Anders Kaseorg, 2010-11-18 21:15 Subject: Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.02.1011181606340.14285%40dr-wily.mit.edu In-Reply-To: <1287798958-22549-1-git-send-email-stevenrwalter@gmail.com> ``` Junio: Did this get lost? It fixes a test suite regression between v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4. Steven: Can you sign off on your commit? Anders On Fri, 22 Oct 2010, Steven Walter wrote: > Specify a revision range to "merge" and manually set the svn:mergeinfo > property. > --- > t/t9157-git-svn-fetch-merge.sh | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh > index da582c5..424e1fa 100755 > --- a/t/t9157-git-svn-fetch-merge.sh > +++ b/t/t9157-git-svn-fetch-merge.sh > @@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' ' > svn add baz && > svn commit -m x && > svn switch "$svnrepo"/trunk && > - svn merge "$svnrepo"/branches/branch1 && > + svn merge -r3:7 "$svnrepo"/branches/branch1 && > + svn propset svn:mergeinfo "/branches/branch1:4-7" . && > svn commit -m "merge" && > svn switch "$svnrepo"/branches/branch1 && > svn commit -m x && > svn switch "$svnrepo"/branches/branch2 && > - svn merge "$svnrepo"/branches/branch1 && > + svn merge -r3:8 "$svnrepo"/branches/branch1 && > + svn propset svn:mergeinfo "/branches/branch1:4-8" . && > svn commit -m "merge branch1" && > svn switch "$svnrepo"/trunk && > - svn merge "$svnrepo"/branches/branch2 && > + svn merge -r5:9 "$svnrepo"/branches/branch2 && > + svn propset svn:mergeinfo "/branches/branch1:4-8 > +/branches/branch2:6-9" . && > svn resolved baz && > svn commit -m "merge branch2" > ) && > -- > 1.6.3.3 > > ``` ## Anders Kaseorg, 2010-11-18 23:35 Subject: Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.02.1011181826560.14285%40dr-wily.mit.edu In-Reply-To: ``` On Thu, 18 Nov 2010, Anders Kaseorg wrote: > Junio: Did this get lost? It fixes a test suite regression between > v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4. Hmm, perhaps I spoke too soon; when I actually run the patched test on an Ubuntu 8.04 system, I still get a failure. Apparently Subversion 1.4 thinks the manually set svn:mergeinfo properties cause conflicts: + svn merge -r5:9 file:///tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2 A baz C . + svn propset svn:mergeinfo /branches/branch1:4-8 /branches/branch2:6-9 . property 'svn:mergeinfo' set on '.' + svn resolved baz + svn commit -m merge branch2 svn: Commit failed (details follow): svn: Aborting commit: '/tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/.git/svn/refs/remotes/git-svn/svn-tree' remains in conflict Anders ``` ## Eric Wong, 2010-11-25 23:39 Subject: Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Message-ID: <20101125233922.GA3317@dcvr.yhbt.net> URL: https://gitlist.dev/e/20101125233922.GA3317%40dcvr.yhbt.net In-Reply-To: ``` Anders Kaseorg wrote: > On Thu, 18 Nov 2010, Anders Kaseorg wrote: > > Junio: Did this get lost? It fixes a test suite regression between > > v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4. > > Hmm, perhaps I spoke too soon; when I actually run the patched test on an > Ubuntu 8.04 system, I still get a failure. Apparently Subversion 1.4 > thinks the manually set svn:mergeinfo properties cause conflicts: Perhaps the test (and feature) should just be disabled with older SVN? -- Eric Wong ```