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>
Liam Beguin committed
Dec 5, 2017 at 12:52 UTC
d80fc29367a6cf92792db6e3d1b5ce2ae2d81de8
1 file changed
+5
-5
builtin/rebase--helper.c
+5
-5
@@ -14,7 +14,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
14
struct replay_opts opts = REPLAY_OPTS_INIT;
15
int keep_empty = 0;
16
enum {
17
- CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S,
17
+ CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
18
CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH
19
} command = 0;
20
struct option options[] = {
@@ -27,9 +27,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
27
OPT_CMDMODE(0, "make-script", &command,
28
N_("make rebase script"), MAKE_SCRIPT),
29
OPT_CMDMODE(0, "shorten-ids", &command,
30
- N_("shorten SHA-1s in the todo list"), SHORTEN_SHA1S),
30
+ N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
31
OPT_CMDMODE(0, "expand-ids", &command,
32
- N_("expand SHA-1s in the todo list"), EXPAND_SHA1S),
32
+ N_("expand commit ids in the todo list"), EXPAND_OIDS),
33
OPT_CMDMODE(0, "check-todo-list", &command,
34
N_("check the todo list"), CHECK_TODO_LIST),
35
OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
@@ -54,9 +54,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
54
return !!sequencer_remove_state(&opts);
55
if (command == MAKE_SCRIPT && argc > 1)
56
return !!sequencer_make_script(keep_empty, stdout, argc, argv);
57
- if (command == SHORTEN_SHA1S && argc == 1)
57
+ if (command == SHORTEN_OIDS && argc == 1)
58
return !!transform_todos(1);
59
- if (command == EXPAND_SHA1S && argc == 1)
59
+ if (command == EXPAND_OIDS && argc == 1)
60
return !!transform_todos(0);
61
if (command == CHECK_TODO_LIST && argc == 1)
62
return !!check_todo_list();