]> gitweb.fluxo.info Git - rhatto/apps.git/commitdiff
Fixes arg parsing and displayal of remote version
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 3 Apr 2017 23:49:35 +0000 (20:49 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 3 Apr 2017 23:49:35 +0000 (20:49 -0300)
inception
metadot

index 8ee6dde63a960d2e2fb7274e463f7d33596d9e04..3d536a31236b01ce52b219eb3b9daf17fce00737 100755 (executable)
--- 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 1e49ba900bcc8808ea8654dbe21f2e8a5ff634a5..1f232b2c1295c58c95cf0264278f8fa67366b063 160000 (submodule)
--- a/metadot
+++ b/metadot
@@ -1 +1 @@
-Subproject commit 1e49ba900bcc8808ea8654dbe21f2e8a5ff634a5
+Subproject commit 1f232b2c1295c58c95cf0264278f8fa67366b063