From: Fred T. Hamster <fred@gruntose.com>
Date: Thu, 9 Jan 2025 06:05:06 +0000 (-0500)
Subject: still working towards correct locations
X-Git-Tag: 2.140.189^2~39
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=536c155d47310ea46c5f0c101d2771f6ea5e9c5a;p=feisty_meow.git

still working towards correct locations

need to update how we do the find, since sometimes we need to find above and not just below.
---

diff --git a/scripts/rev_control/rcheckin.sh b/scripts/rev_control/rcheckin.sh
index 86e39775..54c1d59d 100644
--- a/scripts/rev_control/rcheckin.sh
+++ b/scripts/rev_control/rcheckin.sh
@@ -25,6 +25,5 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_checkin
 exit_on_error "doing a check-in on: $tempfile"
 
-#rm "$tempfile"
-
 restore_terminal_title
+
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 30f0c14f..2ad76f23 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -100,12 +100,13 @@ function do_revctrl_checkin()
       fi
     fi
   elif [ ! -z "$(seek_writable ".git" "up")" ]; then
-#-d ".git" ]; then
-echo into git case.
     topdir="$(seek_writable ".git" "up")"
 echo "got topdir from seeking of '$topdir'"
     if [ ! -z "$topdir" ]; then
 
+      # jump to the directory above the .git directory, to make git happy.
+      pushd "$topdir/.." &>/dev/null
+
       # take steps to make sure the branch integrity is good and we're up to date against remote repos.
       do_revctrl_careful_update "$topdir"
 
@@ -145,7 +146,10 @@ echo "got topdir from seeking of '$topdir'"
         git push --tags origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
         promote_pipe_return 0
         exit_on_error "git push"
+
       fi
+      # unwind the pushed directory again.
+      popd &>/dev/null
     fi
   else
     # nothing there.  it's not an error though.
@@ -520,7 +524,13 @@ function generate_rev_ctrl_filelist()
   echo -n >$tempfile
   local additional_filter
   find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+
+#hmmm: how to get the report of things ABOVE here, which we need.
+#  can we do an exec using the seek writable?
+
   find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+
+
   # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
   popd &>/dev/null