development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: --build-fake-ancestor expects blobs

Browse source 
The "index" line read from the patch to reconstruct a partial
preimage tree records the object names of blob objects.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-07-03 10:01:22 -07:00
parent daba53aeaf
commit da3ac0c149
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/apply.c
View file

@ -3203,7 +3203,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
name = patch->old_name ? patch->old_name : patch->new_name;
if (0 < patch->is_new)
continue;
else if (get_sha1(patch->old_sha1_prefix, sha1))
else if (get_sha1_blob(patch->old_sha1_prefix, sha1))
/* git diff has no index line for mode/type changes */
if (!patch->lines_added && !patch->lines_deleted) {
if (get_current_sha1(patch->old_name, sha1))

2
t/t1512-rev-parse-disambiguation.sh
View file

@ -54,7 +54,7 @@ test_expect_success 'disambiguate tree-ish' '
git rev-parse --verify 000000000:a0blgqsjc
'
test_expect_failure 'disambiguate blob' '
test_expect_success 'disambiguate blob' '
sed -e "s/|$//" >patch <<-EOF &&
diff --git a/frotz b/frotz
index 000000000..ffffff 100644