2008-02-13 10:50:51 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='add -i basic tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2009-04-03 19:33:59 +00:00
|
|
|
if ! test_have_prereq PERL; then
|
|
|
|
say 'skipping git add -i tests, perl not available'
|
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
2008-02-13 10:50:51 +00:00
|
|
|
test_expect_success 'setup (initial)' '
|
|
|
|
echo content >file &&
|
|
|
|
git add file &&
|
|
|
|
echo more >>file &&
|
|
|
|
echo lines >>file
|
|
|
|
'
|
|
|
|
test_expect_success 'status works (initial)' '
|
|
|
|
git add -i </dev/null >output &&
|
|
|
|
grep "+1/-0 *+2/-0 file" output
|
|
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..d95f3ad
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/file
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+content
|
|
|
|
EOF
|
|
|
|
test_expect_success 'diff works (initial)' '
|
|
|
|
(echo d; echo 1) | git add -i >output &&
|
|
|
|
sed -ne "/new file/,/content/p" <output >diff &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expected diff
|
2008-02-13 10:50:51 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'revert works (initial)' '
|
|
|
|
git add file &&
|
|
|
|
(echo r; echo 1) | git add -i &&
|
|
|
|
git ls-files >output &&
|
|
|
|
! grep . output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup (commit)' '
|
|
|
|
echo baseline >file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m commit &&
|
|
|
|
echo content >>file &&
|
|
|
|
git add file &&
|
|
|
|
echo more >>file &&
|
|
|
|
echo lines >>file
|
|
|
|
'
|
|
|
|
test_expect_success 'status works (commit)' '
|
|
|
|
git add -i </dev/null >output &&
|
|
|
|
grep "+1/-0 *+2/-0 file" output
|
|
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
|
|
index 180b47c..b6f2c08 100644
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1 +1,2 @@
|
|
|
|
baseline
|
|
|
|
+content
|
|
|
|
EOF
|
|
|
|
test_expect_success 'diff works (commit)' '
|
|
|
|
(echo d; echo 1) | git add -i >output &&
|
|
|
|
sed -ne "/^index/,/content/p" <output >diff &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expected diff
|
2008-02-13 10:50:51 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'revert works (commit)' '
|
|
|
|
git add file &&
|
|
|
|
(echo r; echo 1) | git add -i &&
|
|
|
|
git add -i </dev/null >output &&
|
|
|
|
grep "unchanged *+3/-0 file" output
|
|
|
|
'
|
|
|
|
|
2008-07-02 22:00:00 +00:00
|
|
|
cat >expected <<EOF
|
|
|
|
EOF
|
|
|
|
cat >fake_editor.sh <<EOF
|
|
|
|
EOF
|
|
|
|
chmod a+x fake_editor.sh
|
|
|
|
test_set_editor "$(pwd)/fake_editor.sh"
|
|
|
|
test_expect_success 'dummy edit works' '
|
|
|
|
(echo e; echo a) | git add -p &&
|
|
|
|
git diff > diff &&
|
|
|
|
test_cmp expected diff
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >patch <<EOF
|
|
|
|
@@ -1,1 +1,4 @@
|
|
|
|
this
|
|
|
|
+patch
|
|
|
|
-doesn't
|
|
|
|
apply
|
|
|
|
EOF
|
|
|
|
echo "#!$SHELL_PATH" >fake_editor.sh
|
|
|
|
cat >>fake_editor.sh <<\EOF
|
|
|
|
mv -f "$1" oldpatch &&
|
|
|
|
mv -f patch "$1"
|
|
|
|
EOF
|
|
|
|
chmod a+x fake_editor.sh
|
|
|
|
test_set_editor "$(pwd)/fake_editor.sh"
|
|
|
|
test_expect_success 'bad edit rejected' '
|
|
|
|
git reset &&
|
|
|
|
(echo e; echo n; echo d) | git add -p >output &&
|
|
|
|
grep "hunk does not apply" output
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >patch <<EOF
|
|
|
|
this patch
|
|
|
|
is garbage
|
|
|
|
EOF
|
|
|
|
test_expect_success 'garbage edit rejected' '
|
|
|
|
git reset &&
|
|
|
|
(echo e; echo n; echo d) | git add -p >output &&
|
|
|
|
grep "hunk does not apply" output
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >patch <<EOF
|
|
|
|
@@ -1,0 +1,0 @@
|
|
|
|
baseline
|
|
|
|
+content
|
|
|
|
+newcontent
|
|
|
|
+lines
|
|
|
|
EOF
|
|
|
|
cat >expected <<EOF
|
|
|
|
diff --git a/file b/file
|
|
|
|
index b5dd6c9..f910ae9 100644
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
baseline
|
|
|
|
content
|
|
|
|
-newcontent
|
|
|
|
+more
|
|
|
|
lines
|
|
|
|
EOF
|
|
|
|
test_expect_success 'real edit works' '
|
|
|
|
(echo e; echo n; echo d) | git add -p &&
|
|
|
|
git diff >output &&
|
|
|
|
test_cmp expected output
|
|
|
|
'
|
|
|
|
|
2009-10-10 15:51:45 +00:00
|
|
|
test_expect_success 'skip files similarly as commit -a' '
|
|
|
|
git reset &&
|
|
|
|
echo file >.gitignore &&
|
|
|
|
echo changed >file &&
|
|
|
|
echo y | git add -p file &&
|
|
|
|
git diff >output &&
|
|
|
|
git reset &&
|
|
|
|
git commit -am commit &&
|
|
|
|
git diff >expected &&
|
|
|
|
test_cmp expected output &&
|
|
|
|
git reset --hard HEAD^
|
|
|
|
'
|
|
|
|
rm -f .gitignore
|
|
|
|
|
2008-05-20 21:59:32 +00:00
|
|
|
if test "$(git config --bool core.filemode)" = false
|
|
|
|
then
|
2009-02-27 21:20:57 +00:00
|
|
|
say 'skipping filemode tests (filesystem does not properly support modes)'
|
2008-05-20 21:59:32 +00:00
|
|
|
else
|
2009-02-27 21:20:57 +00:00
|
|
|
test_set_prereq FILEMODE
|
|
|
|
fi
|
2008-05-20 21:59:32 +00:00
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'patch does not affect mode' '
|
2008-03-27 07:30:43 +00:00
|
|
|
git reset --hard &&
|
|
|
|
echo content >>file &&
|
|
|
|
chmod +x file &&
|
2008-03-27 07:32:25 +00:00
|
|
|
printf "n\\ny\\n" | git add -p &&
|
2008-03-27 07:30:43 +00:00
|
|
|
git show :file | grep content &&
|
|
|
|
git diff file | grep "new mode"
|
|
|
|
'
|
|
|
|
|
2009-02-27 21:20:57 +00:00
|
|
|
test_expect_success FILEMODE 'stage mode but not hunk' '
|
2008-03-27 07:32:25 +00:00
|
|
|
git reset --hard &&
|
|
|
|
echo content >>file &&
|
|
|
|
chmod +x file &&
|
|
|
|
printf "y\\nn\\n" | git add -p &&
|
|
|
|
git diff --cached file | grep "new mode" &&
|
|
|
|
git diff file | grep "+content"
|
|
|
|
'
|
|
|
|
|
git add -p: demonstrate failure when staging both mode and hunk
When trying to stage changes to file which has also pending `chmod +x`,
`git add -p` produces lots of 'Use of uninitialized value ...' warnings
and fails to do the job:
$ echo content >> file
$ chmod +x file
$ git add -p
diff --git a/file b/file
index e69de29..d95f3ad
--- a/file
+++ b/file
old mode 100644
new mode 100755
Stage mode change [y,n,q,a,d,/,j,J,g,?]? y
@@ -0,0 +1 @@
+content
Stage this hunk [y,n,q,a,d,/,K,g,e,?]? y
Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
Use of uninitialized value $ofs in numeric le (<=) at .../git-add--interactive line 806.
Use of uninitialized value $o0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
Use of uninitialized value $n0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
fatal: corrupt patch at line 5
diff --git a/file b/file
index e69de29..d95f3ad
--- a/file
+++ b/file
@@ -,0 + @@
+content
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-15 12:26:49 +00:00
|
|
|
|
add -p: do not attempt to coalesce mode changes
In 0392513 (add-interactive: refactor mode hunk handling, 2009-04-16),
we merged the interaction loops for mode changes and hunk staging.
This was fine at the time, because 0beee4c (git-add--interactive:
remove hunk coalescing, 2008-07-02) removed hunk coalescing.
However, in 7a26e65 (Revert "git-add--interactive: remove hunk
coalescing", 2009-05-16), we resurrected it. Since then, the code
would attempt in vain to merge mode changes with diff hunks,
corrupting both in the process.
We add a check to the coalescing loop to ensure it only looks at diff
hunks, thus skipping mode changes.
Noticed-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-15 13:56:39 +00:00
|
|
|
test_expect_success FILEMODE 'stage mode and hunk' '
|
git add -p: demonstrate failure when staging both mode and hunk
When trying to stage changes to file which has also pending `chmod +x`,
`git add -p` produces lots of 'Use of uninitialized value ...' warnings
and fails to do the job:
$ echo content >> file
$ chmod +x file
$ git add -p
diff --git a/file b/file
index e69de29..d95f3ad
--- a/file
+++ b/file
old mode 100644
new mode 100755
Stage mode change [y,n,q,a,d,/,j,J,g,?]? y
@@ -0,0 +1 @@
+content
Stage this hunk [y,n,q,a,d,/,K,g,e,?]? y
Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
Use of uninitialized value $ofs in numeric le (<=) at .../git-add--interactive line 806.
Use of uninitialized value $o0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
Use of uninitialized value $n0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
fatal: corrupt patch at line 5
diff --git a/file b/file
index e69de29..d95f3ad
--- a/file
+++ b/file
@@ -,0 + @@
+content
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-15 12:26:49 +00:00
|
|
|
git reset --hard &&
|
|
|
|
echo content >>file &&
|
|
|
|
chmod +x file &&
|
|
|
|
printf "y\\ny\\n" | git add -p &&
|
|
|
|
git diff --cached file | grep "new mode" &&
|
|
|
|
git diff --cached file | grep "+content" &&
|
|
|
|
test -z "$(git diff file)"
|
|
|
|
'
|
|
|
|
|
2008-05-20 21:59:32 +00:00
|
|
|
# end of tests disabled when filemode is not usable
|
2008-03-27 07:32:25 +00:00
|
|
|
|
2009-05-25 12:07:55 +00:00
|
|
|
test_expect_success 'setup again' '
|
|
|
|
git reset --hard &&
|
|
|
|
test_chmod +x file &&
|
|
|
|
echo content >>file
|
|
|
|
'
|
|
|
|
|
2009-05-16 03:10:19 +00:00
|
|
|
# Write the patch file with a new line at the top and bottom
|
|
|
|
cat >patch <<EOF
|
|
|
|
index 180b47c..b6f2c08 100644
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1,2 +1,4 @@
|
|
|
|
+firstline
|
|
|
|
baseline
|
|
|
|
content
|
|
|
|
+lastline
|
|
|
|
EOF
|
|
|
|
# Expected output, similar to the patch but w/ diff at the top
|
|
|
|
cat >expected <<EOF
|
|
|
|
diff --git a/file b/file
|
|
|
|
index b6f2c08..61b9053 100755
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1,2 +1,4 @@
|
|
|
|
+firstline
|
|
|
|
baseline
|
|
|
|
content
|
|
|
|
+lastline
|
|
|
|
EOF
|
|
|
|
# Test splitting the first patch, then adding both
|
2009-05-16 17:48:23 +00:00
|
|
|
test_expect_success 'add first line works' '
|
2009-05-16 03:10:19 +00:00
|
|
|
git commit -am "clear local changes" &&
|
|
|
|
git apply patch &&
|
|
|
|
(echo s; echo y; echo y) | git add -p file &&
|
|
|
|
git diff --cached > diff &&
|
|
|
|
test_cmp expected diff
|
|
|
|
'
|
|
|
|
|
2008-02-13 10:50:51 +00:00
|
|
|
test_done
|