From 022e9d12e8b7485f2a507ae251010cf88a23d4ce Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 3 Apr 2017 20:49:35 -0300 Subject: Fixes arg parsing and displayal of remote version --- inception | 6 ++++-- metadot | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/inception b/inception index 8ee6dde..3d536a3 100755 --- a/inception +++ b/inception @@ -124,12 +124,12 @@ function inception_version { echo "origin/master branch:" echo "=====================" echo "" - ( cd $DIRNAME && $GIT log --show-signature -n 1 --branches=origin/master ) + ( cd $DIRNAME && $GIT log --show-signature -n 1 --remotes --branches=origin/master ) } # Fetch function inception_fetch { - ( cd $DIRNAME && $GIT fetch --all && $GIT log --show-signature -n 1 --branches=origin/master ) + ( cd $DIRNAME && $GIT fetch --all && $GIT log --show-signature -n 1 --remotes --branches=origin/master ) } # Merge @@ -154,4 +154,6 @@ elif [ "$1" == "fetch" ]; then inception_fetch elif [ "$1" == "merge" ]; then inception_merge +else + inception_usage fi diff --git a/metadot b/metadot index 1e49ba9..1f232b2 160000 --- a/metadot +++ b/metadot @@ -1 +1 @@ -Subproject commit 1e49ba900bcc8808ea8654dbe21f2e8a5ff634a5 +Subproject commit 1f232b2c1295c58c95cf0264278f8fa67366b063 -- cgit v1.2.3