t/t7507-commit-verbose.sh

   1 #!/bin/sh
   2
   3 test_description='verbose commit template'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7
   8 write_script "check-for-diff" <<\EOF &&
   9 grep '^diff --git' "$1" >out
  10 exit 0
  11 EOF
  12 test_set_editor "$PWD/check-for-diff"
  13
  14 cat >message <<'EOF'
  15 subject
  16
  17 body
  18 EOF
  19
  20 test_expect_success 'setup' '
  21         echo content >file &&
  22         git add file &&
  23         git commit -F message
  24 '
  25
  26 test_expect_success 'initial commit shows verbose diff' '
  27         git commit --amend -v &&
  28         test_line_count = 1 out
  29 '
  30
  31 test_expect_success 'second commit' '
  32         echo content modified >file &&
  33         git add file &&
  34         git commit -F message
  35 '
  36
  37 check_message() {
  38         git log -1 --pretty=format:%s%n%n%b >actual &&
  39         test_cmp "$1" actual
  40 }
  41
  42 test_expect_success 'verbose diff is stripped out' '
  43         git commit --amend -v &&
  44         check_message message &&
  45         test_line_count = 1 out
  46 '
  47
  48 test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
  49         git config diff.mnemonicprefix true &&
  50         git commit --amend -v &&
  51         check_message message &&
  52         test_line_count = 1 out
  53 '
  54
  55 cat >diff <<'EOF'
  56 This is an example commit message that contains a diff.
  57
  58 diff --git c/file i/file
  59 new file mode 100644
  60 index 0000000..f95c11d
  61 --- /dev/null
  62 +++ i/file
  63 @@ -0,0 +1 @@
  64 +this is some content
  65 EOF
  66
  67 test_expect_success 'diff in message is retained without -v' '
  68         git commit --amend -F diff &&
  69         check_message diff
  70 '
  71
  72 test_expect_success 'diff in message is retained with -v' '
  73         git commit --amend -F diff -v &&
  74         check_message diff
  75 '
  76
  77 test_expect_success 'submodule log is stripped out too with -v' '
  78         git config diff.submodule log &&
  79         git submodule add ./. sub &&
  80         git commit -m "sub added" &&
  81         (
  82                 cd sub &&
  83                 echo "more" >>file &&
  84                 git commit -a -m "submodule commit"
  85         ) &&
  86         (
  87                 GIT_EDITOR=cat &&
  88                 export GIT_EDITOR &&
  89                 test_must_fail git commit -a -v 2>err
  90         ) &&
  91         test_i18ngrep "Aborting commit due to empty commit message." err
  92 '
  93
  94 test_expect_success 'verbose diff is stripped out with set core.commentChar' '
  95         (
  96                 GIT_EDITOR=cat &&
  97                 export GIT_EDITOR &&
  98                 test_must_fail git -c core.commentchar=";" commit -a -v 2>err
  99         ) &&
 100         test_i18ngrep "Aborting commit due to empty commit message." err
 101 '
 102
 103 test_expect_success 'status does not verbose without --verbose' '
 104         git status >actual &&
 105         ! grep "^diff --git" actual
 106 '
 107
 108 test_expect_success 'setup -v -v' '
 109         echo dirty >file
 110 '
 111
 112 for i in true 1
 113 do
 114         test_expect_success "commit.verbose=$i and --verbose omitted" "
 115                 git -c commit.verbose=$i commit --amend &&
 116                 test_line_count = 1 out
 117         "
 118 done
 119
 120 for i in false -2 -1 0
 121 do
 122         test_expect_success "commit.verbose=$i and --verbose omitted" "
 123                 git -c commit.verbose=$i commit --amend &&
 124                 test_line_count = 0 out
 125         "
 126 done
 127
 128 for i in 2 3
 129 do
 130         test_expect_success "commit.verbose=$i and --verbose omitted" "
 131                 git -c commit.verbose=$i commit --amend &&
 132                 test_line_count = 2 out
 133         "
 134 done
 135
 136 for i in true false -2 -1 0 1 2 3
 137 do
 138         test_expect_success "commit.verbose=$i and --verbose" "
 139                 git -c commit.verbose=$i commit --amend --verbose &&
 140                 test_line_count = 1 out
 141         "
 142
 143         test_expect_success "commit.verbose=$i and --no-verbose" "
 144                 git -c commit.verbose=$i commit --amend --no-verbose &&
 145                 test_line_count = 0 out
 146         "
 147
 148         test_expect_success "commit.verbose=$i and -v -v" "
 149                 git -c commit.verbose=$i commit --amend -v -v &&
 150                 test_line_count = 2 out
 151         "
 152 done
 153
 154 test_expect_success "status ignores commit.verbose=true" '
 155         git -c commit.verbose=true status >actual &&
 156         ! grep "^diff --git actual"
 157 '
 158
 159 test_done