Browse files

Be a little less verbose if we can.

Instead of showing "git push origin master:master", just show "git push origin master".
  • Loading branch information...
1 parent b0807d3 commit 4b52a1423bd26020d747f36b168741de99be2601 @eventualbuddha eventualbuddha committed Jul 13, 2011
Showing with 7 additions and 1 deletion.
  1. +7 −1 bin/ship
View
8 bin/ship
@@ -122,7 +122,13 @@ else
git merge $CURRENT ||
die "Could not merge branch $CURRENT into $TRACK_BRANCH. You may need to resolve conflicts."
fi
- git push $REMOTE $CURRENT:$TRACK_BRANCH ||
+
+ if [[ "$CURRENT" == "$TRACK_BRANCH" ]]; then
+ MAPPING="$CURRENT"
+ else
+ MAPPING="$CURRENT:$TRACK_BRANCH"
+ fi
+ git push $REMOTE "$MAPPING" ||
die "Could not push changes to $REMOTE/$TRACK_BRANCH. Check your network connection."
fi

0 comments on commit 4b52a14

Please sign in to comment.