log -L: test merge of parallel modify/rename

diff --git a/git-remote-testgit b/git-remote-testgit
index efda74bee33dbf346de5af79a2bcc45003f6fd5b..b395c8de59c33768f1a957248447d162bda8ef94 100755 (executable)
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -61,11 +61,26 @@ do
                        echo "feature import-marks=$gitmarks"
                        echo "feature export-marks=$gitmarks"
                fi
-               git fast-export --use-done-feature "${testgitmarks_args[@]}" $refs |
+               echo "feature done"
+               git fast-export "${testgitmarks_args[@]}" $refs |
                sed -e "s#refs/heads/#${prefix}/heads/#g"
+               echo "done"
                ;;
        export)
+               before=$(git for-each-ref --format='%(refname) %(objectname)')
+
                git fast-import "${testgitmarks_args[@]}" --quiet
+
+               after=$(git for-each-ref --format='%(refname) %(objectname)')
+
+               # figure out which refs were updated
+               join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
+               while read ref a b
+               do
+                       test $a == $b && continue
+                       echo "ok $ref"
+               done
+
                echo
                ;;
        '')