gitweb: introduce remote_heads feature

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 64a4265cfcdcfa79085328308509ad60b113c0e2..b4f40e4c3a53388e72347e8e3894edd05f17dab5 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -149,10 +149,16 @@ test_expect_success 'reject non-strategy with a git-merge-foo name' '
 '
 
 test_expect_success 'merge c0 with c1' '
+       echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
+
        git reset --hard c0 &&
        git merge c1 &&
        verify_merge file result.1 &&
-       verify_head "$c1"
+       verify_head "$c1" &&
+
+       git reflog -1 >reflog.actual &&
+       sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
+       test_cmp reflog.expected reflog.fuzzy
 '
 
 test_debug 'git log --graph --decorate --oneline --all'
@@ -167,6 +173,27 @@ test_expect_success 'merge c0 with c1 with --ff-only' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
+test_expect_success 'merge from unborn branch' '
+       git checkout -f master &&
+       test_might_fail git branch -D kid &&
+
+       echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
+
+       git checkout --orphan kid &&
+       test_when_finished "git checkout -f master" &&
+       git rm -fr . &&
+       test_tick &&
+       git merge --ff-only c1 &&
+       verify_merge file result.1 &&
+       verify_head "$c1" &&
+
+       git reflog -1 >reflog.actual &&
+       sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
+       test_cmp reflog.expected reflog.fuzzy
+'
+
+test_debug 'git log --graph --decorate --oneline --all'
+
 test_expect_success 'merge c1 with c2' '
        git reset --hard c1 &&
        test_tick &&