X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft5520-pull.sh;h=319e389ed0dbb9c920d8d619cdf94ab52145e9f4;hb=8f81449e885ab2b9bac09b5b835314d26f107b3f;hp=e78d40242a80d9b2aa74e74d3a4aecddbb63ab99;hpb=814035c12a07927ea03350184a14f869cdce7276;p=git.git

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index e78d40242..319e389ed 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -26,7 +26,7 @@ cd "$D"
 test_expect_success 'checking the results' '
 	test -f file &&
 	test -f cloned/file &&
-	diff file cloned/file
+	test_cmp file cloned/file
 '
 
 test_expect_success 'pulling into void using master:master' '
@@ -149,4 +149,15 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
 
 '
 
+test_expect_success 'pull --rebase works on branch yet to be born' '
+	git rev-parse master >expect &&
+	mkdir empty_repo &&
+	(cd empty_repo &&
+	 git init &&
+	 git pull --rebase .. master &&
+	 git rev-parse HEAD >../actual
+	) &&
+	test_cmp expect actual
+'
+
 test_done