@matheusbsbs / matheus-bagliano / commits / 693c15dc28
Fork 0

rebase: error out for NO_PYTHON if they use recursive merge

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>

Eric Wong committed Jun 21, 2006 at 03:04 UTC 693c15dc282c36042eac8d215beae3067db7565c
2 files changed +15
git-rebase.sh
+9
@@ -300,6 +300,15 @@ then
300 exit $?
301 fi
302
303 +if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
304 +then
305 + die 'The recursive merge strategy currently relies on Python,
306 +which this installation of git was not configured with. Please consider
307 +a different merge strategy (e.g. octopus, resolve, stupid, ours)
308 +or install Python and git with Python support.'
309 +
310 +fi
311 +
312 # start doing a rebase with git-merge
313 # this is rename-aware if the recursive (default) strategy is used
314
t/t3402-rebase-merge.sh
+6
@@ -7,6 +7,12 @@ test_description='git rebase --merge test'
7
8 . ./test-lib.sh
9
10 +if test "$no_python"; then
11 + echo "Skipping: no python => no recursive merge"
12 + test_done
13 + exit 0
14 +fi
15 +
16 T="A quick brown fox
17 jumps over the lazy dog."
18 for i in 1 2 3 4 5 6 7 8 9 10