diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-21 03:04:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:56:30 -0700 |
| commit | 693c15dc282c36042eac8d215beae3067db7565c (patch) | |
| tree | e61b9d272c16360ebca965a77d93feff4e2bfae7 /git-rebase.sh | |
| parent | c3fb0e358e594d081c7c0f37d557e29d2a5460b4 (diff) | |
| download | git-693c15dc282c36042eac8d215beae3067db7565c.tar.gz git-693c15dc282c36042eac8d215beae3067db7565c.tar.xz | |
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>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index bce7bf84d..b9ce1125d 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -300,6 +300,15 @@ then exit $? 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 # this is rename-aware if the recursive (default) strategy is used |