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

Convert find_unique_abbrev* to struct object_id

Browse Source 
Convert find_unique_abbrev and find_unique_abbrev_r to each take a
pointer 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
2018-03-12 02:27:30 +00:00
committed by Junio C Hamano
parent 40f5555ca3
commit aab9583f7b
28 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/merge.c
View File

@ -1327,7 +1327,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
check_commit_signature(commit, &signature_check);
find_unique_abbrev_r(hex, commit->object.oid.hash, DEFAULT_ABBREV);
find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
switch (signature_check.result) {
case 'G':
break;
@ -1420,9 +1420,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (verbosity >= 0) {
printf(_("Updating %s..%s\n"),
find_unique_abbrev(head_commit->object.oid.hash,
find_unique_abbrev(&head_commit->object.oid,
DEFAULT_ABBREV),
find_unique_abbrev(remoteheads->item->object.oid.hash,
find_unique_abbrev(&remoteheads->item->object.oid,
DEFAULT_ABBREV));
}
strbuf_addstr(&msg, "Fast-forward");