t / t4029-diff-trailing-space.shon commit Merge branch 'jk/ident-ai-canonname-could-be-null' into maint (11738dd)
   1#!/bin/sh
   2#
   3# Copyright (c) Jim Meyering
   4#
   5test_description='diff honors config option, diff.suppressBlankEmpty'
   6
   7. ./test-lib.sh
   8
   9cat <<\EOF > exp ||
  10diff --git a/f b/f
  11index 5f6a263..8cb8bae 100644
  12--- a/f
  13+++ b/f
  14@@ -1,2 +1,2 @@
  15
  16-x
  17+y
  18EOF
  19exit 1
  20
  21test_expect_success \
  22    "$test_description" \
  23    'printf "\nx\n" > f &&
  24     git add f &&
  25     git commit -q -m. f &&
  26     printf "\ny\n" > f &&
  27     git config --bool diff.suppressBlankEmpty true &&
  28     git diff f > actual &&
  29     test_cmp exp actual &&
  30     perl -i.bak -p -e "s/^\$/ /" exp &&
  31     git config --bool diff.suppressBlankEmpty false &&
  32     git diff f > actual &&
  33     test_cmp exp actual &&
  34     git config --bool --unset diff.suppressBlankEmpty &&
  35     git diff f > actual &&
  36     test_cmp exp actual
  37     '
  38
  39test_done