mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/pull: convert portions to struct object_id

Browse Source 
Convert the caller of sha1_array_append to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-03-26 16:01:27 +00:00
committed by Junio C Hamano
parent 9c4b0f66aa
commit 14bb40b3f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/pull.c
View File

@ -335,16 +335,16 @@ static void get_merge_heads(struct sha1_array *merge_heads)
const char *filename = git_path("FETCH_HEAD"); const char *filename = git_path("FETCH_HEAD");
FILE *fp; FILE *fp;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
unsigned char sha1[GIT_SHA1_RAWSZ]; struct object_id oid;
if (!(fp = fopen(filename, "r"))) if (!(fp = fopen(filename, "r")))
die_errno(_("could not open '%s' for reading"), filename); die_errno(_("could not open '%s' for reading"), filename);
while (strbuf_getline_lf(&sb, fp) != EOF) { while (strbuf_getline_lf(&sb, fp) != EOF) {
if (get_sha1_hex(sb.buf, sha1)) if (get_oid_hex(sb.buf, &oid))
continue; /* invalid line: does not start with SHA1 */ continue; /* invalid line: does not start with SHA1 */
if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t")) if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
continue; /* ref is not-for-merge */ continue; /* ref is not-for-merge */
sha1_array_append(merge_heads, sha1); sha1_array_append(merge_heads, oid.hash);
} }
fclose(fp); fclose(fp);
strbuf_release(&sb); strbuf_release(&sb);