Index: tools/tools/git/arcgit
===================================================================
--- tools/tools/git/arcgit
+++ tools/tools/git/arcgit
@@ -69,7 +69,7 @@
 
 	git checkout $commit > /dev/null || error "Could not checkout $commit"
 
-	arc_dir="$(git rev-parse --show-toplevel)/.git/arc"
+	arc_dir="$(git rev-parse --git-dir)/arc"
 	arc_msg="$arc_dir/create-message"
 	mkdir -p $arc_dir
 	git show -s --format='%B' HEAD > $arc_msg
Index: tools/tools/git/importgit
===================================================================
--- tools/tools/git/importgit
+++ tools/tools/git/importgit
@@ -95,9 +95,10 @@
 	error -u "-g <repo> argument is mandatory"
 fi
 
-git="$git_repo/.git"
+git="$(git -C $git_repo rev-parse --git-dir 2> /dev/null)"
+ret=$?
 
-if [ ! -d "$git" ]
+if [ "$ret" != 0 ]
 then
 	error "$git_repo does not seem to be a git repo"
 fi