summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-22 15:07:54 -0700
committerJunio C Hamano <gitster@pobox.com>2012-03-22 15:08:35 -0700
commitd5b592cf6799e3e9d80150c62af6033ba2c32a5a (patch)
treefa4d66df71d618a223f526fe2c85835e4c2cb8ab /read-cache.c
parent498a04af143f55a7bbbba484d48a7f123d43be04 (diff)
parent536caca5ce0d88e4c54e9e7376ed182807702c58 (diff)
downloadgit-jk/merge-recursive-no-rename-empty.tar.gz
Adjust 'jk/maint-1.7.7-merge-recursive-no-rename-empty' for the 1.7.10 codebasejk/merge-recursive-no-rename-empty
A new offender that casts EMPTY_TREE_SHA1_BIN was added to sequencer.c after 1.7.9.x maintenance track; adjust the "merge-recursive" series applied for older maintenance track to the current codebase. * jk/maint-1.7.7-merge-recursive-no-rename-empty: merge-recursive: don't detect renames from empty files make is_empty_blob_sha1 available everywhere drop casts from users EMPTY_TREE_SHA1_BIN
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/read-cache.c b/read-cache.c
index 274e54b4f3..6c8f395836 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -157,16 +157,6 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
return 0;
}
-static int is_empty_blob_sha1(const unsigned char *sha1)
-{
- static const unsigned char empty_blob_sha1[20] = {
- 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
- 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
- };
-
- return !hashcmp(sha1, empty_blob_sha1);
-}
-
static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
{
unsigned int changed = 0;