summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-03-26 16:01:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-27 05:08:21 (GMT)
commit14bb40b3f0c646ca81609be1eb3039ede6ce5cc4 (patch)
tree1dab143ee3a25bb0872605a72e8bb586e0426858 /builtin
parent9c4b0f66aab720a997228c071c671454196706d6 (diff)
downloadgit-14bb40b3f0c646ca81609be1eb3039ede6ce5cc4.zip
git-14bb40b3f0c646ca81609be1eb3039ede6ce5cc4.tar.gz
git-14bb40b3f0c646ca81609be1eb3039ede6ce5cc4.tar.bz2
builtin/pull: convert portions to struct object_id
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pull.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 3ecb881..a9f7553 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -335,16 +335,16 @@ static void get_merge_heads(struct sha1_array *merge_heads)
const char *filename = git_path("FETCH_HEAD");
FILE *fp;
struct strbuf sb = STRBUF_INIT;
- unsigned char sha1[GIT_SHA1_RAWSZ];
+ struct object_id oid;
if (!(fp = fopen(filename, "r")))
die_errno(_("could not open '%s' for reading"), filename);
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 */
if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
continue; /* ref is not-for-merge */
- sha1_array_append(merge_heads, sha1);
+ sha1_array_append(merge_heads, oid.hash);
}
fclose(fp);
strbuf_release(&sb);