Home » Mailing list archives » git » 2008 » October » 26

[PATCH 3/3] Fix git update-ref --no-deref -d.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Miklos Vajna
Subject: [PATCH 3/3] Fix git update-ref --no-deref -d.
Date: Saturday, October 25, 2008 - 7:33 pm

Till now --no-deref was just ignored when deleting refs, fix this.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 builtin-update-ref.c  |    8 +++++---
 t/t1400-update-ref.sh |    7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index d8f3142..378dc1b 100644
--- 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
index 04c2b16..8139cd6 100755
--- 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
 "
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] Implement git remote mv, Miklos Vajna, (Tue Oct 21, 5:23 pm)
Re: [PATCH] Implement git remote mv, Brandon Casey, (Wed Oct 22, 9:52 am)
[PATCH] Implement git remote mv, Miklos Vajna, (Wed Oct 22, 6:18 pm)
Re: [PATCH] Implement git remote mv, Jeff King, (Wed Oct 22, 8:52 pm)
[PATCH] Implement git remote rename, Miklos Vajna, (Thu Oct 23, 5:56 am)
Re: [PATCH] Implement git remote rename, Junio C Hamano, (Fri Oct 24, 4:33 pm)
[PATCH 0/2] Fixes for git branch -m / update-ref --no-deref -d, Miklos Vajna, (Sat Oct 25, 5:58 am)
[PATCH 1/2] Fix git branch -m for symrefs., Miklos Vajna, (Sat Oct 25, 5:58 am)
[PATCH 2/2] Fix git update-ref --no-deref -d., Miklos Vajna, (Sat Oct 25, 5:58 am)
Re: [PATCH 1/2] Fix git branch -m for symrefs., Junio C Hamano, (Sat Oct 25, 11:31 am)
[PATCH 0/3] symref rename/delete fixes, Miklos Vajna, (Sat Oct 25, 7:33 pm)
[PATCH 1/3] Fix git branch -m for symrefs., Miklos Vajna, (Sat Oct 25, 7:33 pm)
[PATCH 2/3] rename_ref(): handle the case when the reflog ..., Miklos Vajna, (Sat Oct 25, 7:33 pm)
[PATCH 3/3] Fix git update-ref --no-deref -d., Miklos Vajna, (Sat Oct 25, 7:33 pm)
[PATCH] Implement git remote rename, Miklos Vajna, (Mon Nov 3, 11:26 am)
Re: [PATCH] Implement git remote rename, Miklos Vajna, (Mon Nov 10, 1:42 pm)
[PATCH 1/4] remote: add a new 'origin' variable to the struct, Miklos Vajna, (Mon Nov 10, 1:43 pm)
[PATCH 2/4] git-remote rename: support remotes-&gt;config mig ..., Miklos Vajna, (Mon Nov 10, 1:43 pm)