summaryrefslogtreecommitdiff
path: root/builtin-reflog.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-11 00:53:31 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-11 00:53:31 -0700
commit10d9d887ecdc81197162d7bbe5dfc0d028498fd6 (patch)
treef726621f79162565bf066400df697a078680601a /builtin-reflog.c
parent71b9979bc74b66c1cf961d5c74de5c0b3cbf00a4 (diff)
parent4f80b27d48fee1c588810f3341ffe5d14558cea2 (diff)
downloadgit-10d9d887ecdc81197162d7bbe5dfc0d028498fd6.tar.gz
Merge branch 'maint'
* maint: Documentation: fix invalid reference to 'mybranch' in user manual Fix deleting reflog entries from HEAD reflog reflog test: add more tests for 'reflog delete' Documentation: rev-list-options: Fix -g paragraph formatting Conflicts: Documentation/user-manual.txt
Diffstat (limited to 'builtin-reflog.c')
-rw-r--r--builtin-reflog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-reflog.c b/builtin-reflog.c
index 0c34e37819..196fa03b7f 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;
}