mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
816366e23d
This updates t4014 to check the two fixes for git-am and git-commit we observed with "echo" that does backslash interpolation by default without being asked with -e option. Signed-off-by: Junio C Hamano <junkio@cox.net>
88 lines
2 KiB
Bash
Executable file
88 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='Format-patch skipping already incorporated patches'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
|
|
git add file &&
|
|
git commit -m Initial &&
|
|
git checkout -b side &&
|
|
|
|
for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
|
|
git update-index file &&
|
|
git commit -m "Side changes #1" &&
|
|
|
|
for i in D E F; do echo "$i"; done >>file &&
|
|
git update-index file &&
|
|
git commit -m "Side changes #2" &&
|
|
git tag C2 &&
|
|
|
|
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
|
|
git update-index file &&
|
|
git commit -m "Side changes #3 with \\n backslash-n in it." &&
|
|
|
|
git checkout master &&
|
|
git diff-tree -p C2 | git apply --index &&
|
|
git commit -m "Master accepts moral equivalent of #2"
|
|
|
|
'
|
|
|
|
test_expect_success "format-patch --ignore-if-in-upstream" '
|
|
|
|
git format-patch --stdout master..side >patch0 &&
|
|
cnt=`grep "^From " patch0 | wc -l` &&
|
|
test $cnt = 3
|
|
|
|
'
|
|
|
|
test_expect_success "format-patch --ignore-if-in-upstream" '
|
|
|
|
git format-patch --stdout \
|
|
--ignore-if-in-upstream master..side >patch1 &&
|
|
cnt=`grep "^From " patch1 | wc -l` &&
|
|
test $cnt = 2
|
|
|
|
'
|
|
|
|
test_expect_success "format-patch result applies" '
|
|
|
|
git checkout -b rebuild-0 master &&
|
|
git am -3 patch0 &&
|
|
cnt=`git rev-list master.. | wc -l` &&
|
|
test $cnt = 2
|
|
'
|
|
|
|
test_expect_success "format-patch --ignore-if-in-upstream result applies" '
|
|
|
|
git checkout -b rebuild-1 master &&
|
|
git am -3 patch1 &&
|
|
cnt=`git rev-list master.. | wc -l` &&
|
|
test $cnt = 2
|
|
'
|
|
|
|
test_expect_success 'commit did not screw up the log message' '
|
|
|
|
git cat-file commit side | grep "^Side .* with .* backslash-n"
|
|
|
|
'
|
|
|
|
test_expect_success 'format-patch did not screw up the log message' '
|
|
|
|
grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
|
|
grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
|
|
|
|
'
|
|
|
|
test_expect_success 'replay did not screw up the log message' '
|
|
|
|
git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
|
|
|
|
'
|
|
|
|
test_done
|