git-svn: support for funky branch and project names over HTTP(S)

diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index 4f3d053889de4a5ba8e6e5d519c014a51220accd..29dba4ba3a57c15bd430bd23c1cebe78e6dc03be 100755 (executable)
--- a/git-merge-ours.sh
+++ b/git-merge-ours.sh
@@ -9,6 +9,6 @@
 # because the current index is what we will be committing as the
 # merge result.
 
-test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+git diff-index --quiet --cached HEAD -- || exit 2
 
 exit 0