From: Junio C Hamano Date: Sun, 10 Aug 2008 01:01:41 GMT Subject: Re: [PATCH 2/2] builtin-reflog: fix deletion of HEAD entries Message-ID: <7vd4kh4r9m.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7vhc9t4s2c.fsf@gitster.siamese.dyndns.org> Junio C Hamano writes: > Pieter de Bie writes: > >> dwim_ref() used to resolve HEAD to its symlink (like refs/heads/master), >> making a call to 'git reflog delete HEAD@{1}' to actually delete the second >> entry in the master reflog. >> >> This patch makes a special case for HEAD (as that's the only non-branch >> reflog we keep), fixing the issue. > > What happens to remotes/origin/HEAD that points at remotes/origin/master? Perhaps this might work better? builtin-reflog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-reflog.c b/builtin-reflog.c index 0c34e37..a48f664 100644 --- a/builtin-reflog.c +++ b/builtin-reflog.c @@ -604,7 +604,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix) continue; } - if (!dwim_ref(argv[i], spec - argv[i], sha1, &ref)) { + if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) { status |= error("%s points nowhere!", argv[i]); continue; }