Skip to content

Commit d80fc29

Browse files
liambeguingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8dccc7a commit d80fc29

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

builtin/rebase--helper.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
1414
struct replay_opts opts = REPLAY_OPTS_INIT;
1515
int keep_empty = 0;
1616
enum {
17-
CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S,
17+
CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
1818
CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH
1919
} command = 0;
2020
struct option options[] = {
@@ -27,9 +27,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
2727
OPT_CMDMODE(0, "make-script", &command,
2828
N_("make rebase script"), MAKE_SCRIPT),
2929
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),
3131
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),
3333
OPT_CMDMODE(0, "check-todo-list", &command,
3434
N_("check the todo list"), CHECK_TODO_LIST),
3535
OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
@@ -54,9 +54,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
5454
return !!sequencer_remove_state(&opts);
5555
if (command == MAKE_SCRIPT && argc > 1)
5656
return !!sequencer_make_script(keep_empty, stdout, argc, argv);
57-
if (command == SHORTEN_SHA1S && argc == 1)
57+
if (command == SHORTEN_OIDS && argc == 1)
5858
return !!transform_todos(1);
59-
if (command == EXPAND_SHA1S && argc == 1)
59+
if (command == EXPAND_OIDS && argc == 1)
6060
return !!transform_todos(0);
6161
if (command == CHECK_TODO_LIST && argc == 1)
6262
return !!check_todo_list();

0 commit comments

Comments
 (0)