undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: error out for NO_PYTHON if they use recursive merge

Browse Source 
recursive merge relies on Python, and we can't perform
rename-aware merges without the recursive merge.  So bail out
before trying it.

The test won't work w/o recursive merge, either, so skip that,
too.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-06-21 03:04:42 -07:00 committed by Junio C Hamano
parent c3fb0e358e
commit 693c15dc28
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-rebase.sh
View File

@ -300,6 +300,15 @@ then
exit $? exit $?
fi fi
if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
then
die 'The recursive merge strategy currently relies on Python,
which this installation of git was not configured with. Please consider
a different merge strategy (e.g. octopus, resolve, stupid, ours)
or install Python and git with Python support.'
fi
# start doing a rebase with git-merge # start doing a rebase with git-merge
# this is rename-aware if the recursive (default) strategy is used # this is rename-aware if the recursive (default) strategy is used

6
t/t3402-rebase-merge.sh
View File

@ -7,6 +7,12 @@ test_description='git rebase --merge test'
. ./test-lib.sh . ./test-lib.sh
if test "$no_python"; then
echo "Skipping: no python => no recursive merge"
test_done
exit 0
fi
T="A quick brown fox T="A quick brown fox
jumps over the lazy dog." jumps over the lazy dog."
for i in 1 2 3 4 5 6 7 8 9 10 for i in 1 2 3 4 5 6 7 8 9 10