summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-28 13:42:24 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-28 13:42:25 -0800
commit682098b847a98f9a93b56d50b27bd5aa2141426c (patch)
treea804eaf3d25d394e07ce419e35fd534f422251be /t
parentb7973fbbc3f8f72df352f4ef1a2ff325db92c36f (diff)
parentef90ab66e8eaa863777a8d383c5af2ff43a426d2 (diff)
downloadgit-682098b847a98f9a93b56d50b27bd5aa2141426c.tar.gz
Merge branch 'jk/pickaxe-textconv'
Use textconv filters when searching with "log -S". * jk/pickaxe-textconv: pickaxe: use textconv for -S counting pickaxe: hoist empty needle check
Diffstat (limited to 't')
-rwxr-xr-xt/t4030-diff-textconv.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 461d27ac20..53ec330ce8 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(-)