diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 18:43:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 22:08:09 (GMT) |
| commit | 80ff47957b3a8ae057178a7b1113d171404e938f (patch) | |
| tree | 89508cb9b1146dc48c91a6a425d4af5b1b2aff0e /git-rebase--interactive.sh | |
| parent | 7b37a7c6204998faa80a4bdc1e1ab824bd37d941 (diff) | |
| download | git-80ff47957b3a8ae057178a7b1113d171404e938f.zip git-80ff47957b3a8ae057178a7b1113d171404e938f.tar.gz git-80ff47957b3a8ae057178a7b1113d171404e938f.tar.bz2 | |
rebase: remember strategy and strategy options
When a rebase is resumed, interactive rebase remembers any merge
strategy passed when the rebase was initated. Make non-interactive
rebase remember any merge strategy as well. Also make non-interactive
rebase remember any merge strategy options.
To be able to resume a rebase that was initiated with an older version
of git (older than this commit), make sure not to expect the saved
option files to exist.
Test case idea taken from Junio's 71fc224 (t3402: test "rebase
-s<strategy> -X<opt>", 2010-11-11).
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f076a6e..5773b75 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -584,7 +584,6 @@ skip_unnecessary_picks () { get_saved_options () { test -d "$rewritten" && preserve_merges=t - test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" test -f "$state_dir"/rebase-root && rebase_root=t } @@ -713,7 +712,6 @@ case "$rebase_root" in *) : >"$state_dir"/rebase-root ;; esac -test -z "$strategy" || echo "$strategy" > "$state_dir"/strategy if test t = "$preserve_merges" then if test -z "$rebase_root" |