rebase -i: replace reference to sha1 with oid

Since we are trying to abstract the hash function name elsewhere in the
code base, lets use OID instead of SHA-1 in the rebase--helper too.

Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 8ad4779d1650588084caccd1da5d5ca73376c993..c3b8e4d401f8058db46c3ad1b93db988bd373756 100644 (file)
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -14,7 +14,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
        struct replay_opts opts = REPLAY_OPTS_INIT;
        int keep_empty = 0;
        enum {
        struct replay_opts opts = REPLAY_OPTS_INIT;
        int keep_empty = 0;
        enum {

-               CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S,
+               CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,

                CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH
        } command = 0;
        struct option options[] = {
                CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH
        } command = 0;
        struct option options[] = {


@@ -27,9 +27,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                OPT_CMDMODE(0, "make-script", &command,
                        N_("make rebase script"), MAKE_SCRIPT),
                OPT_CMDMODE(0, "shorten-ids", &command,
                OPT_CMDMODE(0, "make-script", &command,
                        N_("make rebase script"), MAKE_SCRIPT),
                OPT_CMDMODE(0, "shorten-ids", &command,

-                       N_("shorten SHA-1s in the todo list"), SHORTEN_SHA1S),
+                       N_("shorten commit ids in the todo list"), SHORTEN_OIDS),

                OPT_CMDMODE(0, "expand-ids", &command,
                OPT_CMDMODE(0, "expand-ids", &command,

-                       N_("expand SHA-1s in the todo list"), EXPAND_SHA1S),
+                       N_("expand commit ids in the todo list"), EXPAND_OIDS),

                OPT_CMDMODE(0, "check-todo-list", &command,
                        N_("check the todo list"), CHECK_TODO_LIST),
                OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
                OPT_CMDMODE(0, "check-todo-list", &command,
                        N_("check the todo list"), CHECK_TODO_LIST),
                OPT_CMDMODE(0, "skip-unnecessary-picks", &command,


@@ -54,9 +54,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                return !!sequencer_remove_state(&opts);
        if (command == MAKE_SCRIPT && argc > 1)
                return !!sequencer_make_script(keep_empty, stdout, argc, argv);
                return !!sequencer_remove_state(&opts);
        if (command == MAKE_SCRIPT && argc > 1)
                return !!sequencer_make_script(keep_empty, stdout, argc, argv);

-       if (command == SHORTEN_SHA1S && argc == 1)
+       if (command == SHORTEN_OIDS && argc == 1)

                return !!transform_todos(1);
                return !!transform_todos(1);

-       if (command == EXPAND_SHA1S && argc == 1)
+       if (command == EXPAND_OIDS && argc == 1)

                return !!transform_todos(0);
        if (command == CHECK_TODO_LIST && argc == 1)
                return !!check_todo_list();
                return !!transform_todos(0);
        if (command == CHECK_TODO_LIST && argc == 1)
                return !!check_todo_list();