mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
builtin/pull: make hash-size independent
Instead of using get_oid_hex and GIT_SHA1_HEXSZ, use parse_oid_hex to avoid the need for a constant and simplify the code. Additionally, fix some comments to refer to object IDs instead of SHA-1 and update a constant used to provide an allocation hint. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
24dd363ed5
commit
fbfc089d91
|
@ -369,9 +369,10 @@ static void get_merge_heads(struct oid_array *merge_heads)
|
||||||
|
|
||||||
fp = xfopen(filename, "r");
|
fp = xfopen(filename, "r");
|
||||||
while (strbuf_getline_lf(&sb, fp) != EOF) {
|
while (strbuf_getline_lf(&sb, fp) != EOF) {
|
||||||
if (get_oid_hex(sb.buf, &oid))
|
const char *p;
|
||||||
continue; /* invalid line: does not start with SHA1 */
|
if (parse_oid_hex(sb.buf, &oid, &p))
|
||||||
if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
|
continue; /* invalid line: does not start with object ID */
|
||||||
|
if (starts_with(p, "\tnot-for-merge\t"))
|
||||||
continue; /* ref is not-for-merge */
|
continue; /* ref is not-for-merge */
|
||||||
oid_array_append(merge_heads, &oid);
|
oid_array_append(merge_heads, &oid);
|
||||||
}
|
}
|
||||||
|
@ -760,7 +761,7 @@ static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,
|
||||||
cp.no_stderr = 1;
|
cp.no_stderr = 1;
|
||||||
cp.git_cmd = 1;
|
cp.git_cmd = 1;
|
||||||
|
|
||||||
ret = capture_command(&cp, &sb, GIT_SHA1_HEXSZ);
|
ret = capture_command(&cp, &sb, GIT_MAX_HEXSZ);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
|
@ -805,7 +806,7 @@ static int get_octopus_merge_base(struct object_id *merge_base,
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Given the current HEAD SHA1, the merge head returned from git-fetch and the
|
* Given the current HEAD oid, the merge head returned from git-fetch and the
|
||||||
* fork point calculated by get_rebase_fork_point(), runs git-rebase with the
|
* fork point calculated by get_rebase_fork_point(), runs git-rebase with the
|
||||||
* appropriate arguments and returns its exit status.
|
* appropriate arguments and returns its exit status.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue