aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-04-03 20:49:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-04-03 20:49:35 -0300
commit022e9d12e8b7485f2a507ae251010cf88a23d4ce (patch)
tree6ecc5a7cf4f74500f88588dacce9c8e427ffbebd
parent528f51a01390becf3e3e7e09f49151b5438e5b90 (diff)
downloadapps-022e9d12e8b7485f2a507ae251010cf88a23d4ce.tar.gz
apps-022e9d12e8b7485f2a507ae251010cf88a23d4ce.tar.bz2
Fixes arg parsing and displayal of remote version
-rwxr-xr-xinception6
m---------metadot0
2 files changed, 4 insertions, 2 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
-Subproject 1e49ba900bcc8808ea8654dbe21f2e8a5ff634a
+Subproject 1f232b2c1295c58c95cf0264278f8fa67366b06