Fix git update-ref --no-deref -d.

Miklos Vajna · gitster · commit 569740bdd053 · 2008-10-26T14:44:25.000-07:00
Till now --no-deref was just ignored when deleting refs, fix this.

Signed-off-by: Miklos Vajna &lt;vmiklos@frugalware.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-update-ref.c b/builtin-update-ref.c
@@ -13,7 +13,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
 	const char *refname, *oldval, *msg=NULL;
 	unsigned char sha1[20], oldsha1[20];
-	int delete = 0, no_deref = 0;
+	int delete = 0, no_deref = 0, flags = 0;
 	struct option options[] = {
 		OPT_STRING( 'm', NULL, &msg, "reason", "reason of the update"),
 		OPT_BOOLEAN('d', NULL, &delete, "deletes the reference"),
@@ -47,9 +47,11 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 	if (oldval && *oldval && get_sha1(oldval, oldsha1))
 		die("%s: not a valid old SHA1", oldval);
 
+	if (no_deref)
+		flags = REF_NODEREF;
 	if (delete)
-		return delete_ref(refname, oldval ? oldsha1 : NULL, 0);
+		return delete_ref(refname, oldval ? oldsha1 : NULL, flags);
 	else
 		return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
-				  no_deref ? REF_NODEREF : 0, DIE_ON_ERR);
+				  flags, DIE_ON_ERR);
 }
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
@@ -75,6 +75,13 @@ test_expect_success "delete $m (by HEAD)" '
 '
 rm -f .git/$m
 
+cp -f .git/HEAD .git/HEAD.orig
+test_expect_success "delete symref without dereference" '
+	git update-ref --no-deref -d HEAD &&
+	! test -f .git/HEAD
+'
+cp -f .git/HEAD.orig .git/HEAD
+
 test_expect_success '(not) create HEAD with old sha1' "
 	test_must_fail git update-ref HEAD $A $B
 "

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,13 @@ test_expect_success "delete $m (by HEAD)" '`
`75`	`75`	`'`
`76`	`76`	`rm -f .git/$m`
`77`	`77`
	`78`	`+cp -f .git/HEAD .git/HEAD.orig`
	`79`	`+test_expect_success "delete symref without dereference" '`
	`80`	`+ git update-ref --no-deref -d HEAD &&`
	`81`	`+ ! test -f .git/HEAD`
	`82`	`+'`
	`83`	`+cp -f .git/HEAD.orig .git/HEAD`
	`84`	`+`
`78`	`85`	`test_expect_success '(not) create HEAD with old sha1' "`
`79`	`86`	`test_must_fail git update-ref HEAD $A $B`
`80`	`87`	`"`