From 55beff4f536011e5d7f17ae63911f1bb56308feb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 10 Aug 2008 23:21:25 -0700 Subject: [PATCH] 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 --- builtin-reflog.c | 4 ++-- t/t1410-reflog.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin-reflog.c b/builtin-reflog.c index 125d455b97..7d7047d792 100644 --- 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 index 3b9860ea2e..5b24f05573 100755 --- 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 && -- 2.11.4.GIT