mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
bb034f839a
An earlier commit c149184 (allow git-am to run in a subdirectory) taught
git-am to start from a subdirectory by going up to the root of the work
tree byitself, but it did not adjust the path to read the mbox from when
it did so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.3 KiB
Bash
Executable file
72 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git am running from a subdirectory'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo hello >world &&
|
|
git add world &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
git tag initial &&
|
|
echo goodbye >world &&
|
|
git add world &&
|
|
test_tick &&
|
|
git commit -m second &&
|
|
git format-patch --stdout HEAD^ >patchfile &&
|
|
: >expect
|
|
'
|
|
|
|
test_expect_success 'am regularly from stdin' '
|
|
git checkout initial &&
|
|
git am <patchfile &&
|
|
git diff master >actual &&
|
|
diff -u expect actual
|
|
'
|
|
|
|
test_expect_success 'am regularly from file' '
|
|
git checkout initial &&
|
|
git am patchfile &&
|
|
git diff master >actual &&
|
|
diff -u expect actual
|
|
'
|
|
|
|
test_expect_success 'am regularly from stdin in subdirectory' '
|
|
rm -fr subdir &&
|
|
git checkout initial &&
|
|
(
|
|
mkdir -p subdir &&
|
|
cd subdir &&
|
|
git am <../patchfile
|
|
) &&
|
|
git diff master>actual &&
|
|
diff -u expect actual
|
|
'
|
|
|
|
test_expect_success 'am regularly from file in subdirectory' '
|
|
rm -fr subdir &&
|
|
git checkout initial &&
|
|
(
|
|
mkdir -p subdir &&
|
|
cd subdir &&
|
|
git am ../patchfile
|
|
) &&
|
|
git diff master >actual &&
|
|
diff -u expect actual
|
|
'
|
|
|
|
test_expect_success 'am regularly from file in subdirectory with full path' '
|
|
rm -fr subdir &&
|
|
git checkout initial &&
|
|
P=$(pwd) &&
|
|
(
|
|
mkdir -p subdir &&
|
|
cd subdir &&
|
|
git am "$P/patchfile"
|
|
) &&
|
|
git diff master >actual &&
|
|
diff -u expect actual
|
|
'
|
|
|
|
test_done
|