summaryrefslogtreecommitdiff
path: root/builtin-fetch--tool.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-19 01:18:55 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-19 01:18:55 -0400
commitf5bf6feb05b8c89c448ded6e6fad0eb58ef35463 (patch)
tree9f166b46e5005a38d0aeb59a9b4880b508578688 /builtin-fetch--tool.c
parentd7e56dbc4f60f6bd238e8612783541d89f006fb7 (diff)
parentbbaf63f2f18242484868d6c03d5df9bd071d6deb (diff)
downloadgit-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.gz
Merge branch 'maint'
* maint: Further 1.5.3.5 fixes described in release notes Avoid invoking diff drivers during git-stash attr: fix segfault in gitattributes parsing code Define NI_MAXSERV if not defined by operating system Ensure we add directories in the correct order Avoid scary errors about tagged trees/blobs during git-fetch
Diffstat (limited to 'builtin-fetch--tool.c')
-rw-r--r--builtin-fetch--tool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 1e43d79221..e26817de21 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -131,7 +131,7 @@ static int append_fetch_head(FILE *fp,
if (get_sha1(head, sha1))
return error("Not a valid object name: %s", head);
- commit = lookup_commit_reference(sha1);
+ commit = lookup_commit_reference_gently(sha1, 1);
if (!commit)
not_for_merge = 1;