path: root/builtin/pull.c
diff options
authorbrian m. carlson <>2017-03-31 01:40:00 (GMT)
committerJunio C Hamano <>2017-03-31 15:33:56 (GMT)
commit910650d2f8755359ab7b1f0e2a2d576c06a68091 (patch)
treec0ebaef3c66710ea08e1c766ec1553f0105fcc21 /builtin/pull.c
parent1b7ba794d21836f72e5888db63ab790077c04e1b (diff)
Rename sha1_array to oid_array
Since this structure handles an array of object IDs, rename it to struct oid_array. Also rename the accessor functions and the initialization constant. This commit was produced mechanically by providing non-Documentation files to the following Perl one-liners: perl -pi -E 's/struct sha1_array/struct oid_array/g' perl -pi -E 's/\bsha1_array_/oid_array_/g' perl -pi -E 's/SHA1_ARRAY_INIT/OID_ARRAY_INIT/g' Signed-off-by: brian m. carlson <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/pull.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 183e377..d8aa26d 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -330,7 +330,7 @@ static int git_pull_config(const char *var, const char *value, void *cb)
* Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
* into merge_heads.
-static void get_merge_heads(struct sha1_array *merge_heads)
+static void get_merge_heads(struct oid_array *merge_heads)
const char *filename = git_path("FETCH_HEAD");
FILE *fp;
@@ -344,7 +344,7 @@ static void get_merge_heads(struct sha1_array *merge_heads)
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, &oid);
+ oid_array_append(merge_heads, &oid);
@@ -769,7 +769,7 @@ static int run_rebase(const struct object_id *curr_head,
int cmd_pull(int argc, const char **argv, const char *prefix)
const char *repo, **refspecs;
- struct sha1_array merge_heads = SHA1_ARRAY_INIT;
+ struct oid_array merge_heads = OID_ARRAY_INIT;
struct object_id orig_head, curr_head;
struct object_id rebase_fork_point;