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

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>

diff --git a/t/t4150-am-subdir.sh b/t/t4150-am-subdir.sh
deleted file mode 100755 (executable)
index 52069b4..0000000
--- a/t/t4150-am-subdir.sh
+++ /dev/null
@@ -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

diff --git a/t/t4151-am.sh b/t/t4150-am.sh
similarity index 90%
rename from t/t4151-am.sh
rename to t/t4150-am.sh
index ec1b442..722ae96 100755 (executable)
--- a/t/t4151-am.sh
+++ b/t/t4150-am.sh
@@ -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