summaryrefslogtreecommitdiff
path: root/git-rebase--preserve-merges.sh
diff options
context:
space:
mode:
authorAlban Gruin <alban.gruin@gmail.com>2018-09-27 21:56:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-09 01:44:10 (GMT)
commit34b47315d9721a576b9536492cca0c11588113a2 (patch)
treefd8d62c7944c08c9b35f797a75e467036e18bf27 /git-rebase--preserve-merges.sh
parentcf808208ec09727d993d670619c517bdcb00ca2b (diff)
downloadgit-34b47315d9721a576b9536492cca0c11588113a2.zip
git-34b47315d9721a576b9536492cca0c11588113a2.tar.gz
git-34b47315d9721a576b9536492cca0c11588113a2.tar.bz2
rebase -i: move rebase--helper modes to rebase--interactive
This moves the rebase--helper modes still used by git-rebase--preserve-merges.sh (`--shorten-ids`, `--expand-ids`, `--check-todo-list`, `--rearrange-squash` and `--add-exec-commands`) to rebase--interactive.c. git-rebase--preserve-merges.sh is modified accordingly, and rebase--helper.c is removed as it is useless now. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--preserve-merges.sh')
-rw-r--r--git-rebase--preserve-merges.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
index c51c782..d43b4b5 100644
--- a/git-rebase--preserve-merges.sh
+++ b/git-rebase--preserve-merges.sh
@@ -711,11 +711,11 @@ do_rest () {
}
expand_todo_ids() {
- git rebase--helper --expand-ids
+ git rebase--interactive --expand-ids
}
collapse_todo_ids() {
- git rebase--helper --shorten-ids
+ git rebase--interactive --shorten-ids
}
# Switch to the branch in $into and notify it in the reflog
@@ -876,8 +876,8 @@ init_revisions_and_shortrevisions () {
complete_action() {
test -s "$todo" || echo noop >> "$todo"
- test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
- test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
+ test -z "$autosquash" || git rebase--interactive --rearrange-squash || exit
+ test -n "$cmd" && git rebase--interactive --add-exec-commands --cmd "$cmd"
todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
todocount=${todocount##* }
@@ -912,7 +912,7 @@ EOF
has_action "$todo" ||
return 2
- git rebase--helper --check-todo-list || {
+ git rebase--interactive --check-todo-list || {
ret=$?
checkout_onto
exit $ret