summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-16 14:33:44 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-16 14:33:44 -0700
commit070d276cc15494184d2004d506e663f0cb791d44 (patch)
tree66fda933738d92a0730ed73902a3f0fad0dd04cd
parent659d4c8fb21902660acd52f9e77170e82774b9ff (diff)
parentf6a1e1e288d13472f5f7fe2b907bb8c0bd69a018 (diff)
downloadgit-070d276cc15494184d2004d506e663f0cb791d44.tar.gz
Merge branch 'jh/filter-empty-contents' into maint
The clean/smudge interface did not work well when filtering an empty contents (failed and then passed the empty input through). It can be argued that a filter that produces anything but empty for an empty input is nonsense, but if the user wants to do strange things, then why not? * jh/filter-empty-contents: sha1_file: pass empty buffer to index empty file
-rw-r--r--sha1_file.c2
-rwxr-xr-xt/t0021-conversion.sh26
2 files changed, 27 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 001537c935..ac0ca1a0a2 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3202,7 +3202,7 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
int ret;
if (!size) {
- ret = index_mem(sha1, NULL, size, type, path, flags);
+ ret = index_mem(sha1, "", size, type, path, flags);
} else if (size <= SMALL_FILE_SIZE) {
char *buf = xmalloc(size);
if (size == read_in_full(fd, buf, size))
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index ca7d2a630a..e9f1626b09 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -216,4 +216,30 @@ test_expect_success EXPENSIVE 'filter large file' '
! test -s err
'
+test_expect_success "filter: clean empty file" '
+ git config filter.in-repo-header.clean "echo cleaned && cat" &&
+ git config filter.in-repo-header.smudge "sed 1d" &&
+
+ echo "empty-in-worktree filter=in-repo-header" >>.gitattributes &&
+ >empty-in-worktree &&
+
+ echo cleaned >expected &&
+ git add empty-in-worktree &&
+ git show :empty-in-worktree >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success "filter: smudge empty file" '
+ git config filter.empty-in-repo.clean "cat >/dev/null" &&
+ git config filter.empty-in-repo.smudge "echo smudged && cat" &&
+
+ echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
+ echo dead data walking >empty-in-repo &&
+ git add empty-in-repo &&
+
+ echo smudged >expected &&
+ git checkout-index --prefix=filtered- empty-in-repo &&
+ test_cmp expected filtered-empty-in-repo
+'
+
test_done