diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 10:50:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 10:50:07 -0800 |
| commit | 8e8c8817cd3e61d974e02f7276ded1f4cb97d8f3 (patch) | |
| tree | b0c53545af2a313e94ecb59663417840f00f879b /t | |
| parent | 31d66aa4084cb292b15cfdcd6ff73f22f45ab9af (diff) | |
| parent | ef90ab66e8eaa863777a8d383c5af2ff43a426d2 (diff) | |
| download | git-8e8c8817cd3e61d974e02f7276ded1f4cb97d8f3.tar.gz git-8e8c8817cd3e61d974e02f7276ded1f4cb97d8f3.tar.xz | |
Merge branch 'jk/pickaxe-textconv' into maint
"git log -p -S<string>" now looks for the <string> after applying
the textconv filter (if defined); earlier it inspected the contents
of the blobs without filtering.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 461d27ac2..53ec330ce 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -96,6 +96,18 @@ test_expect_success 'grep-diff (-G) operates on textconv data (modification)' ' test_cmp expect actual ' +test_expect_success 'pickaxe (-S) operates on textconv data (add)' ' + echo one >expect && + git log --root --format=%s -S0 >actual && + test_cmp expect actual +' + +test_expect_success 'pickaxe (-S) operates on textconv data (modification)' ' + echo two >expect && + git log --root --format=%s -S1 >actual && + test_cmp expect actual +' + cat >expect.stat <<'EOF' file | Bin 2 -> 4 bytes 1 file changed, 0 insertions(+), 0 deletions(-) |