aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-05-14 14:26:09 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-05-14 14:26:09 -0300
commitc31d9f1126dd87fefc5d36673a03ddfa753bf2b4 (patch)
treef34baceae0554004ba8200d7e6073e3e48c3ada1
parentfc6d705e67aaf7489c3465d7cab85dd57b81b0f7 (diff)
downloadutils-git-c31d9f1126dd87fefc5d36673a03ddfa753bf2b4.tar.gz
utils-git-c31d9f1126dd87fefc5d36673a03ddfa753bf2b4.tar.bz2
Auto fetch changes on commit, fix staging check
-rwxr-xr-xcommit3
-rwxr-xr-xcommit-updates4
2 files changed, 4 insertions, 3 deletions
diff --git a/commit b/commit
index ccf03f6..e7026b6 100755
--- a/commit
+++ b/commit
@@ -131,6 +131,8 @@ function git_commit {
# If there are no staged files, commit everything.
# Otherwise commit just what was staged
if git status --short | grep -q "^[AM]"; then
+ flag=""
+ else
flag="-a"
fi
@@ -148,5 +150,6 @@ if [ ! -z "$1" ]; then
git_user
git_commit $*
git_push
+ git fetch --all
fi
fi
diff --git a/commit-updates b/commit-updates
index b033348..082727d 100755
--- a/commit-updates
+++ b/commit-updates
@@ -13,11 +13,9 @@ if git status &> /dev/null; then
else
commit "Updates $(basename `pwd`)"
fi
-
- git fetch --all
else
if [ ! -z "$1" ] && [ -d "$1" ]; then
- ( cd $1 &> /dev/null && commit "Updates $(basename $1)" && git fetch --all )
+ ( cd $1 &> /dev/null && commit "Updates $(basename $1)" )
else
mr commit -m "Updates"
mr fetch