Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
in_merge_bases(): support only one "other" commit
[gitweb.git]
/
builtin
/
fetch.c
diff --git
a/builtin/fetch.c
b/builtin/fetch.c
index 8ec4eae3eb78925de41253264380ea5585b0f091..97327e6cc6f5e890c7e10174d7bea5c41d96b28e 100644
(file)
--- a/
builtin/fetch.c
+++ b/
builtin/fetch.c
@@
-314,7
+314,7
@@
static int update_local_ref(struct ref *ref,
return r;
}
- if (in_merge_bases(current,
&updated, 1
)) {
+ if (in_merge_bases(current,
updated
)) {
char quickref[83];
int r;
strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));