summaryrefslogtreecommitdiff
path: root/merge-helpers/mkChangeLogList
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2012-02-23 07:51:50 -0600
committerJoel Sherrill <joel.sherrill@oarcorp.com>2012-02-23 07:51:50 -0600
commit07bc90a71759dd653adf4df5b5c3f6bdabceb04a (patch)
treea80c1b4bd12e19a9d5859eca8c9f699b492085fa /merge-helpers/mkChangeLogList
parent0d5498722ab55705f5947c4640c89a2b0ae8ee87 (diff)
Add initial git support to merge-helper scripts
Diffstat (limited to '')
-rwxr-xr-xmerge-helpers/mkChangeLogList18
1 files changed, 17 insertions, 1 deletions
diff --git a/merge-helpers/mkChangeLogList b/merge-helpers/mkChangeLogList
index 5d9fe9c..007297b 100755
--- a/merge-helpers/mkChangeLogList
+++ b/merge-helpers/mkChangeLogList
@@ -55,7 +55,23 @@ args=$*
dirarg="${basedir}"
# Determine VCS in use
-if [ -d .git ] ; then
+isgit()
+{
+ depth=0
+ dir=.git
+ while [ $depth -lt 10 ]
+ do
+ if [ -d ${dir} ] ; then
+ return 1
+ fi
+ dir=../${dir}
+ depth=`expr ${depth} + 1`
+ done
+ return 0
+}
+
+isgit
+if [ $? -eq 1 ] ; then
VCS=git
elif [ -d CVS ] ; then
VCS=cvs