Make ghmerge compatible with Git worktrees

Git worktrees have .git be a file containing a string identifying the
location of the real .git directory. Thus -d will not match these
worktrees. Use -e instead.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 38733165bb40bcd609d9019354bcdcb0e8e8efa7..128bdb73d57ca37ffaf9194f4797bf8f0ba325a9 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -40,7 +40,7 @@ TARGET=""
 BUILD=yes
 [ -z ${CC+x} ] && CC="ccache gcc" # opensslbuild will otherwise use "ccache clang-3.6"
 
-if [ ! -d .git ] ; then
+if [ ! -e .git ] ; then
     echo Not at a top-level git directory
     exit 1
 fi