From: Alban Gruin Date: Mon, 28 May 2018 12:34:21 +0000 (+0200) Subject: rebase: use the new git-rebase--preserve-merges.sh X-Git-Tag: v2.19.0-rc0~186^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d98d0c018cc8008af386f19a43a8b823a5a08d8?hp=6d98d0c018cc8008af386f19a43a8b823a5a08d8 rebase: use the new git-rebase--preserve-merges.sh Create a new type of rebase, "preserve-merges", used when rebase is called with -p. Before that, the type for preserve-merges was "interactive", and some places of this script compared $type to "interactive". Instead, the code now checks if $interactive_rebase is empty or not, as it is set to "explicit" when calling an interactive rebase (and, possibly, one of its submodes), and "implied" when calling one of its submodes (eg. preserve-merges) *without* interactive rebase. It also detects the presence of the directory "$merge_dir"/rewritten left by the preserve-merges script when calling rebase --continue, --skip, etc., and, if it exists, sets the rebase mode to preserve-merges. In this case, interactive_rebase is set to "explicit", as "implied" would break some tests. Signed-off-by: Alban Gruin ---