From e13ab6ad95d6c7f5287164c440a230826d06e294 Mon Sep 17 00:00:00 2001
From: "Carl D. Roth" <carl.roth@bigswitch.com>
Date: Thu, 13 Sep 2018 12:18:15 -0700
Subject: [PATCH] Clean up gitroot

---
 docker/tools/gitroot | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docker/tools/gitroot b/docker/tools/gitroot
index 908c3eec..f4388df5 100755
--- a/docker/tools/gitroot
+++ b/docker/tools/gitroot
@@ -1,4 +1,13 @@
 #!/bin/sh
+#
+######################################################################
+#
+# gitroot
+#
+# Translate $1 or $PWD into the top-level workspace directory
+# containing .git
+#
+######################################################################
 
 if test $# -gt 0; then
   dir=$(realpath $1)
@@ -10,5 +19,20 @@ while test $dir != /; do
     echo $dir
     break
   fi
+  if test -f $dir/.git; then
+    ndir=$(sed -n -e 's/^gitdir: \(.*\)/\1/p' $dir/.git)
+    if test "$ndir"; then
+      ndir=$(cd $dir && cd $ndir && pwd)
+      ndir=${ndir%/.git/*}
+      if test -d "$ndir"; then
+        dir=$ndir
+        continue
+      fi
+    fi
+  fi
   dir=${dir%/*}
 done
+if test "$dir" = "/"; then
+  echo "*** cannot find git root" 1>&2
+  exit 1
+fi