From f79d4c8a0f22d7fd25018be846c7e48127ed3200 Mon Sep 17 00:00:00 2001 From: Nanako Shiraishi Date: Fri, 10 Apr 2009 09:34:42 +0900 Subject: git-am: teach git-am to apply a patch to an unborn branch People sometimes wonder why they cannot apply a patch that only creates new files to an unborn branch. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano --- t/t4150-am.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 't/t4150-am.sh') diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 5e65afa0c..d6ebbaebe 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -290,4 +290,19 @@ test_expect_success 'am --ignore-date' ' echo "$at" | grep "+0000" ' +test_expect_success 'am into an unborn branch' ' + rm -fr subdir && + mkdir -p subdir && + git format-patch --numbered-files -o subdir -1 first && + ( + cd subdir && + git init && + git am 1 + ) && + result=$( + cd subdir && git rev-parse HEAD^{tree} + ) && + test "z$result" = "z$(git rev-parse first^{tree})" +' + test_done -- cgit v1.2.1