Skip to content

Commit

Permalink
More verbose messages when working around git://
Browse files Browse the repository at this point in the history
  • Loading branch information
rickofullsail committed Sep 15, 2010
1 parent e92360e commit eab571b
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion gitflow.sh
Expand Up @@ -67,7 +67,7 @@ case "$1" in
git submodule init git submodule init
git submodule update git submodule update
# Since submodules use git:// this may have failed - try http:// # Since submodules use git:// this may have failed - try http://
if [ ! -f "$SUBMODULE_FILE" ] ; then if [ ! -f "-$SUBMODULE_FILE" ] ; then
sed -e 's/git:/http:/g' "$MODULES_FILE" > "http-$MODULES_FILE" sed -e 's/git:/http:/g' "$MODULES_FILE" > "http-$MODULES_FILE"
echo "It looks like the submodule update failed." echo "It looks like the submodule update failed."
MOD_DIFF=`diff "$MODULES_FILE" "http-$MODULES_FILE"` MOD_DIFF=`diff "$MODULES_FILE" "http-$MODULES_FILE"`
Expand All @@ -84,6 +84,13 @@ case "$1" in
git submodule update git submodule update
echo " ... reverting back to your original .gitmodules file" echo " ... reverting back to your original .gitmodules file"
mv "original-$MODULES_FILE" "$MODULES_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 fi
cd "$lastcwd" cd "$lastcwd"
fi fi
Expand Down

0 comments on commit eab571b

Please sign in to comment.