undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh

Browse Source 
This patch moves the am test cases in t4150-am.sh and the
am subdirectory test cases from t/t4150-am-subdir.sh into
t/4151-am.sh.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephan Beyer 2008-06-01 00:11:43 +02:00 committed by Junio C Hamano
parent d3a7b8f5c5
commit 8ec00d0534
2 changed files with 34 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
t/t4150-am-subdir.sh
View File

@ -1,72 +0,0 @@
#!/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 &&
test_cmp expect actual
'
test_expect_success 'am regularly from file' '
git checkout initial &&
git am patchfile &&
git diff master >actual &&
test_cmp 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 &&
test_cmp 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 &&
test_cmp 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 &&
test_cmp expect actual
'
test_done

34
t/t4151-am.sh → t/t4150-am.sh
View File

@ -223,4 +223,38 @@ test_expect_success 'am fails on empty patch' '
! test -d .dotest
'
test_expect_success 'am works from stdin in subdirectory' '
rm -fr subdir &&
git checkout first &&
(
mkdir -p subdir &&
cd subdir &&
git am <../patch1
) &&
test -z "$(git diff second)"
'
test_expect_success 'am works from file (relative path given) in subdirectory' '
rm -fr subdir &&
git checkout first &&
(
mkdir -p subdir &&
cd subdir &&
git am ../patch1
) &&
test -z "$(git diff second)"
'
test_expect_success 'am works from file (absolute path given) in subdirectory' '
rm -fr subdir &&
git checkout first &&
P=$(pwd) &&
(
mkdir -p subdir &&
cd subdir &&
git am "$P/patch1"
) &&
test -z "$(git diff second)"
'
test_done