merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/git-tag.sh b/git-tag.sh
index dc6aa9576764d7c2da98fbe15339df685fd8b94c..a0afa25821b5438f41abfed3a2f27bd22767c3d6 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -25,14 +25,12 @@ do
        force=1
        ;;
     -l)
-        cd "$GIT_DIR/refs" &&
        case "$#" in
        1)
-               find tags -type f -print ;;
-       *)
-               shift
-               find tags -type f -print | grep "$@" ;;
+               set x . ;;
        esac
+       shift
+       git rev-parse --symbolic --tags | sort | grep "$@"
        exit $?
        ;;
     -m)