path: root/builtin/blame.c
diff options
authorJunio C Hamano <>2012-09-10 23:30:20 (GMT)
committerJunio C Hamano <>2012-09-11 01:42:30 (GMT)
commitffcabccf5df17f12997feedafefeb5589b8c0511 (patch)
treec65351b5cbc06dc78966cf387411887ea8c35373 /builtin/blame.c
parent785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff)
blame $path: avoid getting fooled by case insensitive filesystems
"git blame MAKEFILE" run in a history that has "Makefile" but not MAKEFILE can get confused on a case insensitive filesystem, because the check we run to see if there is a corresponding file in the working tree with lstat("MAKEFILE") succeeds. In addition to that check, we have to make sure that the given path also exists in the commit we start digging history from (i.e. "HEAD"). Note that this reveals the breakage in a test added in cd8ae20 (git-blame shouldn't crash if run in an unmerged tree, 2007-10-18), which expects the entire merge-in-progress path to be blamed to the working tree when it did not exist in our tree. As it is clear in the log message of that commit, the old breakage was that it was causing an internal error and the fix was about avoiding it. Just check that the command does not die an uncontrolled death. For this particular case, the blame should fail, as the history for the file in that contents has not been committed yet at the point in the test. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/blame.c')
1 files changed, 14 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 324d476..83683b8 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2044,6 +2044,19 @@ static int git_blame_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb);
+static void verify_working_tree_path(unsigned char *head_sha1, const char *path)
+ unsigned char blob_sha1[20];
+ unsigned mode;
+ if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL))
+ die("no such ref: HEAD");
+ if (get_tree_entry(head_sha1, path, blob_sha1, &mode))
+ die("no such path '%s' in HEAD", path);
+ if (sha1_object_info(blob_sha1, NULL) != OBJ_BLOB)
+ die("path '%s' in HEAD is not a blob", path);
* Prepare a dummy commit that represents the work tree (or staged) item.
* Note that annotating work tree item never works in the reverse.
@@ -2062,8 +2075,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
struct cache_entry *ce;
unsigned mode;
- if (get_sha1("HEAD", head_sha1))
- die("No such ref: HEAD");
+ verify_working_tree_path(head_sha1, path);
commit = xcalloc(1, sizeof(*commit));