From 768c3d6133305ea5a52cbd6f987b5c7b69397cfd Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 20 Apr 2016 14:35:23 +0000 Subject: [PATCH] pgit.sh: Improved pdir guessing Signed-off-by: Jan Lindemann --- scripts/pgit.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 0689338c..a8b73008 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -23,11 +23,14 @@ marker() config() { + # guess pdir pdir=`pwd` - while [ `basename $pdir` != proj ]; do - [ "$pdir" = / ] && fatal "didn't find \"proj\" in directory components" - pdir=`dirname $pdir` - done + if [ `ls -d $pdir/*/.git 2>/dev/null | wc -w` -lt 3 ]; then + while [ `basename $pdir` != proj ]; do + [ "$pdir" = / ] && fatal "didn't find \"proj\" in directory components" + pdir=`dirname $pdir` + done + fi pdirs=`(cd $pdir; ls -d */.git | sed 's%/.git%%')` }