From eeae3069a71fe50c7293ff8a70003be82a8e3e66 Mon Sep 17 00:00:00 2001 From: Fred Hamster Date: Tue, 28 Jan 2025 09:37:32 -0500 Subject: [PATCH] added pushd to fix checkin deep in tree --- scripts/rev_control/version_control.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index d4306e26..30c9a0ad 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -63,12 +63,7 @@ function do_revctrl_checkin() #hmmm: abstract reusable code below that processes the directory name for printing. # make a nice echoer since we want to use it inside conditions below. local nicedir="$( \cd "$directory" && /bin/pwd )" -#hmmm: this bit should never fire now. -## local nicedir="$directory" -# if [ -z "$nicedir" -o $nicedir == "." ]; then -# nicedir="$( \cd . && /bin/pwd )" -#echo "re-calculated nicedir as '$nicedir'" -# fi +#echo "nicedir into revctrl checkin is '$nicedir'" # prepare some reporting variables ahead of time. local blatt_report="echo -ne \nchecking in '$nicedir'... " @@ -115,10 +110,10 @@ function do_revctrl_checkin() #fi if [ ! -z "$topdir" ]; then -# # jump to the directory above the .git directory, to make git happy. + # jump to the directory above the .git directory, to make git happy. #echo "pushing this dir: $topdir/.." -# pushd "$topdir/.." &>/dev/null -#newdir="$( \cd . && /bin/pwd )" + pushd "$topdir/.." &>/dev/null +#local newdir="$( \cd . && /bin/pwd )" #echo "now dir is set to $newdir" # take steps to make sure the branch integrity is good and we're up to date against remote repos. @@ -129,6 +124,9 @@ function do_revctrl_checkin() else $blatt_report +#local newdir="$( \cd . && /bin/pwd )" +#echo "dir before checking in is $topdir" + # put all changed and new files in the commit. not to everyone's liking. git add --all . | $TO_SPLITTER promote_pipe_return 0 -- 2.34.1