If a file has been deleted/renamed, annotate refuses to work
because the file does not exist on the working tree anymore
(even if the path provided does match a blob on said revision).
Signed-off-by: Edmundo Carmona Antoranz <eantor...@gmail.com>
---
builtin/blame.c | 5 +++--
t/annotate-tests.sh | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 83612f5..856971a 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2683,12 +2683,13 @@ parse_done:
argv[argc - 1] = "--";
setup_work_tree();
- if (!file_exists(path))
- die_errno("cannot stat path '%s'", path);
}
revs.disable_stdin = 1;
setup_revisions(argc, argv, &revs, NULL);
+ if (!revs.pending.nr && !file_exists(path))
+ die_errno("cannot stat path '%s'", path);
+
memset(&sb, 0, sizeof(sb));
sb.revs = &revs;
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b1673b3..c99ec41 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -567,3 +567,23 @@ test_expect_success 'blame -L X,-N (non-numeric N)' '
test_expect_success 'blame -L ,^/RE/' '
test_must_fail $PROG -L1,^/99/ file
'
+
+test_expect_success 'annotate deleted file' '
+ echo hello world > hello_world.txt &&
+ git add hello_world.txt &&
+ git commit -m "step 1" &&
+ git rm hello_world.txt &&
+ git commit -m "step 2" &&
+ git annotate hello_world.txt HEAD~1 &&
+ test_must_fail git annotate hello_world.txt
+'
+
+test_expect_success 'annotate moved file' '
+ echo hello world > hello_world.txt &&
+ git add hello_world.txt &&
+ git commit -m "step 1" &&
+ git mv hello_world.txt not_there_anymore.txt &&
+ git commit -m "step 2" &&
+ git annotate hello_world.txt HEAD~1 &&
+ test_must_fail git annotate hello_world.txt
+'
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
