# 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
git checkout "$this_branch"
test_or_die "git checking out our current branch: $this_branch"
- # first update all our remote branches to their current state from the repos.
- git remote update
- test_or_die "git remote update"
+#this step didn't help before, and it seems redundant now.
+# # first update all our remote branches to their current state from the repos.
+# git remote update
+# test_or_die "git remote update"
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
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
save_terminal_title
+ local did_anything=
+
while read -u 3 dirname; do
- if [ -z "$dirname" ]; then continue; fi
+ if [ -z "$dirname" ]; then
+ # we often have blank lines in the input file for some reason.
+ continue
+ fi
+ did_anything=yes
pushd "$dirname" &>/dev/null
echo "[$(pwd)]"
$action .
popd &>/dev/null
done 3<"$tempfile"
+ if [ -z "$did_anything" ]; then
+ echo "There was nothing to do the action '$action' on."
+ fi
+
restore_terminal_title
rm $tempfile