find the repo dir properly

diff --git a/misc/tools/conflict-rss.sh b/misc/tools/conflict-rss.sh
index fb10ebd6c39b554e50951f6847b50da36be6feb9..9efabb7ca0d23a0f64d2d03b43b535527ff0ffa3 100755 (executable)
--- a/misc/tools/conflict-rss.sh
+++ b/misc/tools/conflict-rss.sh
@@ -86,14 +86,14 @@ if [ -z "$outdir" ]; then
        set --
 fi
 
-case "$repodir" in
-       '')
-               repo=`git config remote.origin.url | cut -d / -f 4-`
-               ;;
-       *)
-               repo=$repodir # FIXME
-               ;;
-esac
+repo=$(
+       (
+               if [ -n "$repodir" ]; then
+                       cd "$repodir"
+               fi
+               git config remote.origin.url | cut -d / -f 4-
+       )
+)
 
 case "$action" in
        --init)