rebase: drop '-i' from the reflog for interactive-based rebases

A large variety of rebase types are supported by the interactive
machinery, not just the explicitly interactive ones.  These all share
the same code and write the same reflog messages, but the "-i" moniker
in those messages doesn't really have much meaning.  It also becomes
somewhat distracting once we switch the default from the am-backend to
the interactive one.  Just remove the "-i" from these messages.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 77abe674cb9d0afb9aaf60a11d0d95d4b86b9411..ffaa7935240980557bc589d555beec30a006769d 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1441,7 +1441,7 @@ static void set_reflog_action(struct rebase_options *options)
        if (env && strcmp("rebase", env))
                return; /* only override it if it is "rebase" */
 
-       strbuf_addf(&buf, "rebase -i (%s)", options->action);
+       strbuf_addf(&buf, "rebase (%s)", options->action);
        setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
        strbuf_release(&buf);
 }

diff --git a/sequencer.c b/sequencer.c
index f475d2a3b1cde4935005750920ac1b3b2c52f2ea..f8e242b6695b44b30c67a3046693c3b53e969b5a 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -290,7 +290,7 @@ int sequencer_remove_state(struct replay_opts *opts)
                        char *eol = strchr(p, '\n');
                        if (eol)
                                *eol = '\0';
-                       if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) {
+                       if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) {
                                warning(_("could not delete '%s'"), p);
                                ret = -1;
                        }
@@ -324,7 +324,7 @@ static const char *action_name(const struct replay_opts *opts)
        case REPLAY_PICK:
                return N_("cherry-pick");
        case REPLAY_INTERACTIVE_REBASE:
-               return N_("rebase -i");
+               return N_("rebase");
        }
        die(_("unknown action: %d"), opts->action);
 }
@@ -628,7 +628,7 @@ static int do_recursive_merge(struct repository *r,
                               COMMIT_LOCK | SKIP_IF_UNCHANGED))
                /*
                 * TRANSLATORS: %s will be "revert", "cherry-pick" or
-                * "rebase -i".
+                * "rebase".
                 */
                return error(_("%s: Unable to write new index file"),
                        _(action_name(opts)));
@@ -3199,7 +3199,7 @@ static int do_label(struct repository *r, const char *name, int len)
                return error(_("illegal label name: '%.*s'"), len, name);
 
        strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
-       strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);
+       strbuf_addf(&msg, "rebase (label) '%.*s'", len, name);
 
        transaction = ref_store_transaction_begin(refs, &err);
        if (!transaction) {

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c41531f349019fac7baa0d6caaf8a2e6f1463a2a..a31583eb2fda103cdb03fe45fc863bba57562d9c 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -223,7 +223,7 @@ test_expect_success 'reflog for the branch shows state before rebase' '
 '
 
 test_expect_success 'reflog for the branch shows correct finish message' '
-       printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
+       printf "rebase (finish): refs/heads/branch1 onto %s\n" \
                "$(git rev-parse branch2)" >expected &&
        git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
        test_cmp expected actual
@@ -1162,10 +1162,10 @@ test_expect_success 'rebase -i produces readable reflog' '
        git branch -f branch-reflog-test H &&
        git rebase -i --onto I F branch-reflog-test &&
        cat >expect <<-\EOF &&
-       rebase -i (finish): returning to refs/heads/branch-reflog-test
-       rebase -i (pick): H
-       rebase -i (pick): G
-       rebase -i (start): checkout I
+       rebase (finish): returning to refs/heads/branch-reflog-test
+       rebase (pick): H
+       rebase (pick): G
+       rebase (start): checkout I
        EOF
        git reflog -n4 HEAD |
        sed "s/[^:]*: //" >actual &&