summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-06-18 06:48:00 (GMT)
committerEric Wong <normalperson@yhbt.net>2011-06-28 03:26:11 (GMT)
commit124b70a2adad2b2efdf50150a6840f1327d2f2cd (patch)
treed2b9f2f790084bb3624df84d26d28b8703dfcc2c /t
parenteabd73a3b587615ca60e820dfa1b8802d1659db3 (diff)
downloadgit-124b70a2adad2b2efdf50150a6840f1327d2f2cd.zip
git-124b70a2adad2b2efdf50150a6840f1327d2f2cd.tar.gz
git-124b70a2adad2b2efdf50150a6840f1327d2f2cd.tar.bz2
git-svn: Correctly handle root commits in mergeinfo ranges
If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t9159-git-svn-no-parent-mergeinfo.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9159-git-svn-no-parent-mergeinfo.sh b/t/t9159-git-svn-no-parent-mergeinfo.sh
index 9472de3..85120b7 100755
--- a/t/t9159-git-svn-no-parent-mergeinfo.sh
+++ b/t/t9159-git-svn-no-parent-mergeinfo.sh
@@ -2,7 +2,7 @@
test_description='git svn handling of root commits in merge ranges'
. ./lib-git-svn.sh
-test_expect_failure 'test handling of root commits in merge ranges' '
+test_expect_success 'test handling of root commits in merge ranges' '
mkdir -p init/trunk init/branches init/tags &&
echo "r1" > init/trunk/file.txt &&
svn_cmd import -m "initial import" init "$svnrepo" &&