Permalink
Browse files

Merge branch 'hotfix/gitflow-shflags-http-hf2'

  • Loading branch information...
2 parents a4ded6c + de4825a commit 9400216e665ba065ca3432a65c19c31495624a59 @rickofullsail rickofullsail committed Sep 15, 2010
Showing with 9 additions and 1 deletion.
  1. +9 −1 gitflow.sh
View
@@ -70,7 +70,8 @@ case "$1" in
if [ ! -f "$SUBMODULE_FILE" ] ; then
sed -e 's/git:/http:/g' "$MODULES_FILE" > "http-$MODULES_FILE"
echo "It looks like the submodule update failed."
- if [ -z `diff "$MODULES_FILE" "http-$MODULES_FILE"` ] ; then
+ MOD_DIFF=`diff "$MODULES_FILE" "http-$MODULES_FILE"`
+ if [ -z "$MOD_DIFF" ] ; then
echo " ... and it appears to be an unrecoverable problem. Sorry!"
rm "http-$MODULES_FILE"
cd "$lastcwd"
@@ -83,6 +84,13 @@ case "$1" in
git submodule update
echo " ... reverting back to your original .gitmodules file"
mv "original-$MODULES_FILE" "$MODULES_FILE"
+ if [ ! -f "$SUBMODULE_FILE" ] ; then
+ echo "Sorry, but that didn't appear to work, either."
+ cd "$lastcwd"
+ exit
+ else
+ echo "That worked. Submodules look good."
+ fi
fi
cd "$lastcwd"
fi

0 comments on commit 9400216

Please sign in to comment.