Allow builtin-fetch to work on a detached HEAD

spearce · gitster · commit b3abdd9d216c · 2007-09-19T03:22:31.000-07:00
If we are running fetch in a repository that has a detached HEAD
then there is no current_branch available.  In such a case any ref
that the fetch might update by definition cannot also be the current
branch so we should always bypass the "don't update HEAD" test.

Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-fetch.c b/builtin-fetch.c
@@ -151,7 +151,8 @@ static int update_local_ref(struct ref *ref,
 		return 0;
 	}
 
-	if (!strcmp(ref->name, current_branch->name) &&
+	if (current_branch &&
+	    !strcmp(ref->name, current_branch->name) &&
 	    !(update_head_ok || is_bare_repository()) &&
 	    !is_null_sha1(ref->old_sha1)) {
 		/*

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,8 @@ static int update_local_ref(struct ref *ref,`
`151`	`151`	`return 0;`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (!strcmp(ref->name, current_branch->name) &&`
	`154`	`+ if (current_branch &&`
	`155`	`+ !strcmp(ref->name, current_branch->name) &&`
`155`	`156`	`!(update_head_ok \|\| is_bare_repository()) &&`
`156`	`157`	`!is_null_sha1(ref->old_sha1)) {`
`157`	`158`	`/*`