Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge: allow reading the merge commit message from a file
[gitweb.git]
/
builtin
/
pull.c
diff --git
a/builtin/pull.c
b/builtin/pull.c
index 49cc3beb4c428a4bd0513d922b59465ab0c5c414..fe002a72f8ac7f1020a951769641f5f4b39f23b3 100644
(file)
--- a/
builtin/pull.c
+++ b/
builtin/pull.c
@@
-684,7
+684,7
@@
static const char *get_tracking_branch(const char *remote, const char *refspec)
const char *spec_src;
const char *merge_branch;
- refspec_item_init(&spec, refspec, REFSPEC_FETCH);
+ refspec_item_init
_or_die
(&spec, refspec, REFSPEC_FETCH);
spec_src = spec.src;
if (!*spec_src || !strcmp(spec_src, "HEAD"))
spec_src = "HEAD";