projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now complains about attempts to do nothing
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index f33532de8ac96d71d19e2d03219efd8f8ec3e6f3..2e2214913c8055977b6dc86dcc7e2aea514fdb7f 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-94,7
+94,7
@@
function do_checkin()
# there could already be committed changes that haven't been pushed yet.
# upload any changes to the upstream repo so others can see them.
# there could already be committed changes that haven't been pushed yet.
# upload any changes to the upstream repo so others can see them.
- git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ git push
origin "$(my_branch_name)"
2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
test_or_die "git push"
fi
test_or_die "git push"
fi
@@
-336,7
+336,7
@@
function do_update()
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
- git pull --no-ff
origin
2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
test_or_die "git pull of origin without fast forwards"
fi
if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
test_or_die "git pull of origin without fast forwards"
fi
@@
-421,8
+421,16
@@
function perform_revctrl_action_on_file()
save_terminal_title
save_terminal_title
+ local first_run=true
+
while read -u 3 dirname; do
while read -u 3 dirname; do
- if [ -z "$dirname" ]; then continue; fi
+ if [ -z "$dirname" ]; then
+ if [ ! -z "$first_run" ]; then
+ echo "There was nothing to do the action '$action' on."
+ fi
+ break
+ fi
+ unset first_run
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .