Skip to content

Commit facca7f

Browse files
Denton-Lgitster
authored andcommitted
sequencer: rename stash_sha1 to stash_oid
The preferred terminology is to refer to object identifiers as "OIDs". Rename the `stash_sha1` variable to `stash_oid` in order to conform to this. Signed-off-by: Denton Liu <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent be1bb60 commit facca7f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

sequencer.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,23 +3659,23 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset)
36593659

36603660
static int apply_autostash(const char *path)
36613661
{
3662-
struct strbuf stash_sha1 = STRBUF_INIT;
3662+
struct strbuf stash_oid = STRBUF_INIT;
36633663
struct child_process child = CHILD_PROCESS_INIT;
36643664
int ret = 0;
36653665

3666-
if (!read_oneliner(&stash_sha1, path,
3666+
if (!read_oneliner(&stash_oid, path,
36673667
READ_ONELINER_SKIP_IF_EMPTY)) {
3668-
strbuf_release(&stash_sha1);
3668+
strbuf_release(&stash_oid);
36693669
return 0;
36703670
}
3671-
strbuf_trim(&stash_sha1);
3671+
strbuf_trim(&stash_oid);
36723672

36733673
child.git_cmd = 1;
36743674
child.no_stdout = 1;
36753675
child.no_stderr = 1;
36763676
argv_array_push(&child.args, "stash");
36773677
argv_array_push(&child.args, "apply");
3678-
argv_array_push(&child.args, stash_sha1.buf);
3678+
argv_array_push(&child.args, stash_oid.buf);
36793679
if (!run_command(&child))
36803680
fprintf(stderr, _("Applied autostash.\n"));
36813681
else {
@@ -3687,9 +3687,9 @@ static int apply_autostash(const char *path)
36873687
argv_array_push(&store.args, "-m");
36883688
argv_array_push(&store.args, "autostash");
36893689
argv_array_push(&store.args, "-q");
3690-
argv_array_push(&store.args, stash_sha1.buf);
3690+
argv_array_push(&store.args, stash_oid.buf);
36913691
if (run_command(&store))
3692-
ret = error(_("cannot store %s"), stash_sha1.buf);
3692+
ret = error(_("cannot store %s"), stash_oid.buf);
36933693
else
36943694
fprintf(stderr,
36953695
_("Applying autostash resulted in conflicts.\n"
@@ -3698,7 +3698,7 @@ static int apply_autostash(const char *path)
36983698
" \"git stash drop\" at any time.\n"));
36993699
}
37003700

3701-
strbuf_release(&stash_sha1);
3701+
strbuf_release(&stash_oid);
37023702
return ret;
37033703
}
37043704

0 commit comments

Comments
 (0)