git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b79519)
git-svn: avoid self-referencing mergeinfo
authorMichael Contreras <redacted>
Sat, 30 Mar 2013 22:06:42 +0000 (18:06 -0400)
committerEric Wong <redacted>
Thu, 9 May 2013 01:07:39 +0000 (01:07 +0000)
commite234ac9d47b6618f7b7338f95f34d0b70782e4cb
treebaee311f98066eff3566e786889c3c95ab286e9atree | snapshot
parent9b795193a6a7e963db62d9cd8e86752a40940520commit | diff
git-svn: avoid self-referencing mergeinfo

When svn.pushmergeinfo is set, the target branch is included in the
mergeinfo if it was previously merged into one of the source branches.
SVN does not do this.

Remove merge target branch path from resulting mergeinfo when
svn.pushmergeinfo is set to better match the behavior of SVN. Update the
svn-mergeinfo-push test.

[ew: 80 columns]

Signed-off-by: Michael Contreras <redacted>
Reported-by: Avishay Lavie <redacted>
Acked-by: Eric Wong <redacted>
git-svn.perl diff | blob | history
t/t9161-git-svn-mergeinfo-push.sh diff | blob | history
git clone https://git.99rst.org/PROJECT