diff options
| author | Michael Contreras <michael@inetric.com> | 2013-03-30 18:06:42 -0400 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2013-05-09 01:07:39 +0000 |
| commit | e234ac9d47b6618f7b7338f95f34d0b70782e4cb (patch) | |
| tree | baee311f98066eff3566e786889c3c95ab286e9a /t/t9161-git-svn-mergeinfo-push.sh | |
| parent | 9b795193a6a7e963db62d9cd8e86752a40940520 (diff) | |
| download | git-e234ac9d47b6618f7b7338f95f34d0b70782e4cb.tar.gz git-e234ac9d47b6618f7b7338f95f34d0b70782e4cb.tar.xz | |
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 <michael@inetric.com>
Reported-by: Avishay Lavie <avishay.lavie@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9161-git-svn-mergeinfo-push.sh')
| -rwxr-xr-x | t/t9161-git-svn-mergeinfo-push.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh index 6ef0c0bde..1eab7015c 100755 --- a/t/t9161-git-svn-mergeinfo-push.sh +++ b/t/t9161-git-svn-mergeinfo-push.sh @@ -88,7 +88,6 @@ test_expect_success 'check reintegration mergeinfo' ' test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18 /branches/svnb2:3,8,16-17 /branches/svnb3:4,9 -/branches/svnb4:5-6,10-12 /branches/svnb5:6,11" ' |