Fix deleting reflog entries from HEAD reflog

gitster · gitster · commit 55beff4f5360 · 2008-08-10T23:21:25.000-07:00
dwim_ref() used to resolve HEAD symbolic ref to its target (i.e. current
branch).  This incorrectly removed the reflog entry from the current
branch when 'git reflog delete HEAD@{1}' was asked for.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-reflog.c b/builtin-reflog.c
@@ -604,8 +604,8 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 
-		if (!dwim_ref(argv[i], spec - argv[i], sha1, &ref)) {
-			status |= error("%s points nowhere!", argv[i]);
+		if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) {
+			status |= error("no reflog for '%s'", argv[i]);
 			continue;
 		}
 
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
@@ -175,7 +175,7 @@ test_expect_success 'recover and check' '
 
 '
 
-test_expect_failure 'delete' '
+test_expect_success 'delete' '
 	echo 1 > C &&
 	test_tick &&
 	git commit -m rat C &&

Original file line number	Diff line number	Diff line change
`@@ -604,8 +604,8 @@ static int cmd_reflog_delete(int argc, const char *argv, const char prefix)`
`604`	`604`	`continue;`
`605`	`605`	`}`
`606`	`606`
`607`		`- if (!dwim_ref(argv[i], spec - argv[i], sha1, &ref)) {`
`608`		`- status \|= error("%s points nowhere!", argv[i]);`
	`607`	`+ if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) {`
	`608`	`+ status \|= error("no reflog for '%s'", argv[i]);`
`609`	`609`	`continue;`
`610`	`610`	`}`
`611`	`611`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ test_expect_success 'recover and check' '`
`175`	`175`
`176`	`176`	`'`
`177`	`177`
`178`		`-test_expect_failure 'delete' '`
	`178`	`+test_expect_success 'delete' '`
`179`	`179`	`echo 1 > C &&`
`180`	`180`	`test_tick &&`
`181`	`181`	`git commit -m rat C &&`