Fix deleting reflog entries from HEAD reflog

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 <gitster@pobox.com>

diff --git a/builtin-reflog.c b/builtin-reflog.c
index 125d455b97ca499806ff417871ab6ce7aad922c5..7d7047d7924fab88995a35e54c02668c10390390 100644 (file)
--- 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;
                }
 
                        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;
                }
 
                        continue;
                }
 

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 3b9860ea2ec4873d6e1135734817f76cde124032..5b24f05573221afb3dc472e78a443ba718db3c60 100755 (executable)
--- 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 &&
        echo 1 > C &&
        test_tick &&
        git commit -m rat C &&