projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
was simple undefined variable error
[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 1ae3494a11ab19e1312152f38ab885c7a3e3a4af..08a9a07c1f0880bb33b07e1eb7cac00fd56f8ad8 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-305,6
+305,8
@@
function do_careful_git_update()
return 0
fi
return 0
fi
+ local this_branch="$(my_branch_name)"
+
state=$(check_branch_state "$this_branch")
echo "=> branch '$this_branch' state prior to remote update is: $state"
state=$(check_branch_state "$this_branch")
echo "=> branch '$this_branch' state prior to remote update is: $state"
@@
-313,9
+315,6
@@
function do_careful_git_update()
promote_pipe_return 0
test_or_die "git remote update"
promote_pipe_return 0
test_or_die "git remote update"
- local this_branch="$(my_branch_name)"
-#appears to be useless; reports no changes when we need to know about remote changes that do exist:
-#hmmm: trying it out again now that things are better elsewhere. let's see what it says.
state=$(check_branch_state "$this_branch")
echo "=> branch '$this_branch' state after remote update is: $state"
state=$(check_branch_state "$this_branch")
echo "=> branch '$this_branch' state after remote update is: $state"