https-github-com-bit
diff --git a/‎t/t4150-am-subdir.sh‎
Lines changed: 0 additions & 72 deletions b/‎t/t4150-am-subdir.sh‎
Lines changed: 0 additions & 72 deletions
diff --git a/‎t/t4151-am.sh‎ ‎t/t4150-am.sh‎t/t4151-am.sh renamed to t/t4150-am.sh
Lines changed: 34 additions & 0 deletions b/‎t/t4151-am.sh‎ ‎t/t4150-am.sh‎t/t4151-am.sh renamed to t/t4150-am.sh
Lines changed: 34 additions & 0 deletions
@@ -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