Fix recursive gc/repack/fsck

diff --git a/gc-and-repack-recursive b/gc-and-repack-recursive
index 81067252198a8d63584dceede6c9606ac1528c0b..c401d55af1aa13e47d0e1edd94f0eae2a92966c8 100755 (executable)
--- a/gc-and-repack-recursive
+++ b/gc-and-repack-recursive
@@ -2,5 +2,6 @@
 
 prog_dir="`dirname \"$0\"`" &&
 
 
 prog_dir="`dirname \"$0\"`" &&
 

-"$prog_dir"/gc-and-repack && \
-exec git submodule foreach "$prog_dir"/gc-and-repack
+"$prog_dir"/gc-and-repack || exit 1
+git submodule foreach "$prog_dir"/gc-and-repack
+exit 0 # Ignore errors from git submodule in bare repos

diff --git a/gc-and-repack-repos b/gc-and-repack-repos
index c9f0bc1bf2ceb2be0bb67d119cedb755bb6b0a6d..2f6d7312d5008e0cfdf99f5bff1bc107125e5334 100755 (executable)
--- a/gc-and-repack-repos
+++ b/gc-and-repack-repos
@@ -6,7 +6,5 @@ prog_dir="`pwd`" &&
 for d in `"$prog_dir"/ls-not-packed`
 do
    echo "----- $d -----" && cd "$d" &&
 for d in `"$prog_dir"/ls-not-packed`
 do
    echo "----- $d -----" && cd "$d" &&

-   test "$g" = "$d/.git" &&
-   "$prog_dir"/gc-and-repack-recursive ||
-   "$prog_dir"/gc-and-repack
+   "$prog_dir"/gc-and-repack-recursive || exit 1

 done
 done

diff --git a/gc-not-packed-recursive b/gc-not-packed-recursive
index c921386a477e0669e0b31c800b200a18250de7cb..46572cc12261713ba61f78f3d06ed400d732c70e 100755 (executable)
--- a/gc-not-packed-recursive
+++ b/gc-not-packed-recursive
@@ -2,5 +2,6 @@
 
 prog_dir="`dirname \"$0\"`" &&
 
 
 prog_dir="`dirname \"$0\"`" &&
 

-"$prog_dir"/gc-not-packed && \
-exec git submodule foreach "$prog_dir"/gc-not-packed
+"$prog_dir"/gc-not-packed || exit 1
+git submodule foreach "$prog_dir"/gc-not-packed
+exit 0 # Ignore errors from git submodule in bare repos

diff --git a/gc-not-packed-repos b/gc-not-packed-repos
index 4d254090ee63606e340a0db5c622026502533b9c..f7b7c78ab08944f88efd924231f75500bf3cf6f5 100755 (executable)
--- a/gc-not-packed-repos
+++ b/gc-not-packed-repos
@@ -6,7 +6,5 @@ prog_dir="`pwd`" &&
 for d in `"$prog_dir"/ls-not-packed`
 do
    echo "----- $d -----" && cd "$d" &&
 for d in `"$prog_dir"/ls-not-packed`
 do
    echo "----- $d -----" && cd "$d" &&

-   test "$g" = "$d/.git" &&
-   "$prog_dir"/gc-not-packed-recursive ||
-   "$prog_dir"/gc-not-packed
+   "$prog_dir"/gc-not-packed-recursive || exit 1

 done
 done