| commit | e509db990b2ecae642efe3cdef4014d57d525f24 | |
| author | Steffen Prohaska <prohaska@zib.de> | |
| Sat, 26 Jan 2008 09:54:06 +0000 (26 10:54 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jan 2008 01:58:18 +0000 (26 17:58 -0800) | ||
| tree | b2c8ce5e08372d7645e24a0a2cb38e55520ed5c8 | treesnapshot (tar.gz zip) |
| parent | 7549376587ba5ffea973663f72804072d8f1d5dd | commitdiff |
cvsserver: Fix for histories with multiple roots
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 <prohaska@zib.de>
git-cvsserver.perl | 9 ++++++++-
t/t9400-git-cvsserver-server.sh | 10 +++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <prohaska@zib.de>
git-cvsserver.perl | 9 ++++++++-
t/t9400-git-cvsserver-server.sh | 10 +++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-cvsserver.perl | diffblobblamehistory | |
| t/t9400-git-cvsserver-server.sh | diffblobblamehistory |