mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 00:36:37 +02:00
Code

Merge branch 'jc/sequencer-stopped-sha-simplify' 

Code simplification.

* jc/sequencer-stopped-sha-simplify:
  sequencer: stop abbreviating stopped-sha file
This commit is contained in:
Junio C Hamano 2020-10-04 12:49:10 -07:00
parent 741f1f8131 0512eabd91
commit 84cdeed1cb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sequencer.c
View File

@ -120,7 +120,7 @@ static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend")
/*
* When we stop at a given patch via the "edit" command, this file contains
* the abbreviated commit name of the corresponding patch.
* the commit object name of the corresponding patch.
*/
static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha")
/*
@ -3111,11 +3111,12 @@ static int make_patch(struct repository *r,
{
struct strbuf buf = STRBUF_INIT;
struct rev_info log_tree_opt;
const char *subject, *p;
const char *subject;
char hex[GIT_MAX_HEXSZ + 1];
int res = 0;
p = short_commit_name(commit);
if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0)
oid_to_hex_r(hex, &commit->object.oid);
if (write_message(hex, strlen(hex), rebase_path_stopped_sha(), 1) < 0)
return -1;
res |= write_rebase_head(&commit->object.oid);
@ -4527,7 +4528,7 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_oneliner(&buf, rebase_path_stopped_sha(),
READ_ONELINER_SKIP_IF_EMPTY) &&
!get_oid_committish(buf.buf, &oid))
!get_oid_hex(buf.buf, &oid))
record_in_rewritten(&oid, peek_command(&todo_list, 0));
strbuf_release(&buf);
}