find_origin() assumes that there will be only one listing in
diff_queued_diff, but this is not the case when a directory becomes a
file in a single commit. So, don't fail in this case.
Signed-off-by: Ben Willard <benwillard@xxxxxxxxx>
---
builtin-blame.c | 12 ++++++++----
t/t8006-blame.sh | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index cf74a92..3e217af 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -363,16 +363,14 @@ static struct origin *find_origin(struct scoreboard *sb,
diffcore_std(&diff_opts);
/* It is either one entry that says "modified", or "created",
- * or nothing.
+ * or nothing, or two entries (a "deleted" and an "add").
*/
if (!diff_queued_diff.nr) {
/* The path is the same as parent */
porigin = get_origin(sb, parent, origin->path);
hashcpy(porigin->blob_sha1, origin->blob_sha1);
}
- else if (diff_queued_diff.nr != 1)
- die("internal error in blame::find_origin");
- else {
+ else if (diff_queued_diff.nr == 1) {
struct diff_filepair *p = diff_queued_diff.queue[0];
switch (p->status) {
default:
@@ -388,6 +386,12 @@ static struct origin *find_origin(struct scoreboard *sb,
break;
}
}
+ else if (diff_queued_diff.nr == 2) {
+ /* Both added and removed, (ie. directory became a file) */
+ }
+ else {
+ die("internal error in blame::find_origin");
+ }
diff_flush(&diff_opts);
diff_tree_release_paths(&diff_opts);
if (porigin) {
diff --git a/t/t8006-blame.sh b/t/t8006-blame.sh
index 7c271f0..17f38ff 100755
--- a/t/t8006-blame.sh
+++ b/t/t8006-blame.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup' '
git commit -m "Add dir as a file"
'
-test_expect_failure 'blame runs on dir' '
+test_expect_success 'blame runs on dir' '
git blame dir
'
--
1.6.3.1.279.gd4bf4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html