[PATCH 2/2] cvsserver: Fix for histories with multiple roots
flat view
DORMANTno replies
From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:44:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Git histories may have multiple roots, which can cause git merge-base to fail and this caused git cvsserver to die. This commit teaches git cvsserver to handle a failing git merge-base gracefully, and modifies the test case to verify this. All the test cases now use a history with two roots. Signed-off-by: Steffen Prohaska <redacted> --- git-cvsserver.perl | 5 +++++ t/t9400-git-cvsserver-server.sh | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ecded3b..534b41e 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl@@ -2543,6 +2543,11 @@ sub update if ($parent eq $lastpicked) { next; } + # or it may fail to find a merge base. In this + # case we just ignore this merge. + if (system("git merge-base $lastpicked $parent >/dev/null 2>/dev/null")) { + next; + } my $base = safe_pipe_capture('git-merge-base', $lastpicked, $parent); chomp $base;
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 1f2749e..75d1ce4 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh@@ -37,6 +37,13 @@ test_expect_success 'setup' ' echo >empty && git add empty && git commit -q -m "First Commit" && + mkdir secondroot && + ( cd secondroot && + git init && + touch secondrootfile && + git add secondrootfile && + git commit -m "second root") && + git pull secondroot master && git clone -q --local --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 && GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true && GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
@@ -46,7 +53,8 @@ test_expect_success 'setup' ' # as argument to co -d test_expect_success 'basic checkout' \ 'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master && - test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5))" = "empty/1.1/"' + test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" + test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | tail -n 1))" = "secondrootfile/1.1/"' #------------------------ # PSERVER AUTHENTICATION
--
1.5.4.rc4.42.gacc73