aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2024-08-02 22:20:40 -0300
committerSilvio Rhatto <rhatto@riseup.net>2024-08-02 22:20:40 -0300
commitb2bd615615eba504a04c851769e138b554b97688 (patch)
treefbd55265584271f81bfd309b2a103b2cbd67a32f
parent251549d447574f9f20f35c97cb79a24f66eb5c07 (diff)
downloadutils-git-b2bd615615eba504a04c851769e138b554b97688.tar.gz
utils-git-b2bd615615eba504a04c851769e138b554b97688.tar.bz2
Fix: sup, rsup: git repository check
-rwxr-xr-xrsup6
-rwxr-xr-xsup4
2 files changed, 7 insertions, 3 deletions
diff --git a/rsup b/rsup
index c90a8a3..59d95d0 100755
--- a/rsup
+++ b/rsup
@@ -57,7 +57,11 @@ function upward_commit {
}
# Check if it is a git repository
-if [ ! -d ".git" ]; then
+# Thanks https://stackoverflow.com/questions/4917871/does-git-return-specific-return-error-codes#comment124785102_19441790
+#git status &> /dev/null
+#if [ ! -d ".git" ]; then
+#if [ "$?" == "128" ]; then
+if [ "`git rev-parse --is-inside-work-tree &> /dev/null`" == "true" ]; then
echo "$BASENAME: not a git repository"
exit 1
fi
diff --git a/sup b/sup
index 3564418..842ad5a 100755
--- a/sup
+++ b/sup
@@ -39,9 +39,9 @@ GIT="hit"
# done
#}
-# Check if it is a git repository
+# Check if it is a git repository, and wheter we're in the top of it
if [ ! -d ".git" ]; then
- echo "$BASENAME: not a git repository"
+ echo "$BASENAME: not a git repository, or not in the top-level of that repository"
exit 1
fi