mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 18:46:15 +02:00
Code

Merge branch 'db/am-skip-blank-at-the-beginning' 

* db/am-skip-blank-at-the-beginning:
  am: ignore leading whitespace before patch
This commit is contained in:
Junio C Hamano 2011-08-18 22:07:57 -07:00
parent d8308c79fc 0e8341f29d
commit beace29a04
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-am.sh
View File

@ -197,10 +197,15 @@ check_patch_format () {
return 0
fi
# otherwise, check the first few lines of the first patch to try
# to detect its format
# otherwise, check the first few non-blank lines of the first
# patch to try to detect its format
{
read l1
# Start from first line containing non-whitespace
l1=
while test -z "$l1"
do
read l1
done
read l2
read l3
case "$l1" in

18
t/t4150-am.sh
View File

@ -96,6 +96,13 @@ test_expect_success setup '
echo "X-Fake-Field: Line Three" &&
git format-patch --stdout first | sed -e "1d"
} | append_cr >patch1-crlf.eml &&
{
printf "%255s\\n" ""
echo "X-Fake-Field: Line One" &&
echo "X-Fake-Field: Line Two" &&
echo "X-Fake-Field: Line Three" &&
git format-patch --stdout first | sed -e "1d"
} > patch1-ws.eml &&
sed -n -e "3,\$p" msg >file &&
git add file &&
@ -167,6 +174,17 @@ test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'
test_expect_success 'am applies patch e-mail with preceding whitespace' '
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
git am patch1-ws.eml &&
! test -d .git/rebase-apply &&
git diff --exit-code second &&
test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'
test_expect_success 'setup: new author and committer' '
GIT_AUTHOR_NAME="Another Thor" &&
GIT_AUTHOR_EMAIL="a.thor@example.com" &&