t / t3701-add-interactive.shon commit merge-recursive: don't segfault while handling rename clashes (c94736a)
   1#!/bin/sh
   2
   3test_description='add -i basic tests'
   4. ./test-lib.sh
   5
   6test_expect_success 'setup (initial)' '
   7        echo content >file &&
   8        git add file &&
   9        echo more >>file &&
  10        echo lines >>file
  11'
  12test_expect_success 'status works (initial)' '
  13        git add -i </dev/null >output &&
  14        grep "+1/-0 *+2/-0 file" output
  15'
  16cat >expected <<EOF
  17new file mode 100644
  18index 0000000..d95f3ad
  19--- /dev/null
  20+++ b/file
  21@@ -0,0 +1 @@
  22+content
  23EOF
  24test_expect_success 'diff works (initial)' '
  25        (echo d; echo 1) | git add -i >output &&
  26        sed -ne "/new file/,/content/p" <output >diff &&
  27        test_cmp expected diff
  28'
  29test_expect_success 'revert works (initial)' '
  30        git add file &&
  31        (echo r; echo 1) | git add -i &&
  32        git ls-files >output &&
  33        ! grep . output
  34'
  35
  36test_expect_success 'setup (commit)' '
  37        echo baseline >file &&
  38        git add file &&
  39        git commit -m commit &&
  40        echo content >>file &&
  41        git add file &&
  42        echo more >>file &&
  43        echo lines >>file
  44'
  45test_expect_success 'status works (commit)' '
  46        git add -i </dev/null >output &&
  47        grep "+1/-0 *+2/-0 file" output
  48'
  49cat >expected <<EOF
  50index 180b47c..b6f2c08 100644
  51--- a/file
  52+++ b/file
  53@@ -1 +1,2 @@
  54 baseline
  55+content
  56EOF
  57test_expect_success 'diff works (commit)' '
  58        (echo d; echo 1) | git add -i >output &&
  59        sed -ne "/^index/,/content/p" <output >diff &&
  60        test_cmp expected diff
  61'
  62test_expect_success 'revert works (commit)' '
  63        git add file &&
  64        (echo r; echo 1) | git add -i &&
  65        git add -i </dev/null >output &&
  66        grep "unchanged *+3/-0 file" output
  67'
  68
  69cat >expected <<EOF
  70EOF
  71cat >fake_editor.sh <<EOF
  72EOF
  73chmod a+x fake_editor.sh
  74test_set_editor "$(pwd)/fake_editor.sh"
  75test_expect_success 'dummy edit works' '
  76        (echo e; echo a) | git add -p &&
  77        git diff > diff &&
  78        test_cmp expected diff
  79'
  80
  81cat >patch <<EOF
  82@@ -1,1 +1,4 @@
  83 this
  84+patch
  85-doesn't
  86 apply
  87EOF
  88echo "#!$SHELL_PATH" >fake_editor.sh
  89cat >>fake_editor.sh <<\EOF
  90mv -f "$1" oldpatch &&
  91mv -f patch "$1"
  92EOF
  93chmod a+x fake_editor.sh
  94test_set_editor "$(pwd)/fake_editor.sh"
  95test_expect_success 'bad edit rejected' '
  96        git reset &&
  97        (echo e; echo n; echo d) | git add -p >output &&
  98        grep "hunk does not apply" output
  99'
 100
 101cat >patch <<EOF
 102this patch
 103is garbage
 104EOF
 105test_expect_success 'garbage edit rejected' '
 106        git reset &&
 107        (echo e; echo n; echo d) | git add -p >output &&
 108        grep "hunk does not apply" output
 109'
 110
 111cat >patch <<EOF
 112@@ -1,0 +1,0 @@
 113 baseline
 114+content
 115+newcontent
 116+lines
 117EOF
 118cat >expected <<EOF
 119diff --git a/file b/file
 120index b5dd6c9..f910ae9 100644
 121--- a/file
 122+++ b/file
 123@@ -1,4 +1,4 @@
 124 baseline
 125 content
 126-newcontent
 127+more
 128 lines
 129EOF
 130test_expect_success 'real edit works' '
 131        (echo e; echo n; echo d) | git add -p &&
 132        git diff >output &&
 133        test_cmp expected output
 134'
 135
 136if test "$(git config --bool core.filemode)" = false
 137then
 138    say 'skipping filemode tests (filesystem does not properly support modes)'
 139else
 140
 141test_expect_success 'patch does not affect mode' '
 142        git reset --hard &&
 143        echo content >>file &&
 144        chmod +x file &&
 145        printf "n\\ny\\n" | git add -p &&
 146        git show :file | grep content &&
 147        git diff file | grep "new mode"
 148'
 149
 150test_expect_success 'stage mode but not hunk' '
 151        git reset --hard &&
 152        echo content >>file &&
 153        chmod +x file &&
 154        printf "y\\nn\\n" | git add -p &&
 155        git diff --cached file | grep "new mode" &&
 156        git diff          file | grep "+content"
 157'
 158
 159fi
 160# end of tests disabled when filemode is not usable
 161
 162test_done