Handle "dangling" blobs and "unreachable" blobs

Edward Thomson · Edward Thomson · commit cd20e0e7f8aa · 2022-05-18T10:21:36.000-04:00
diff --git a/git-recover b/git-recover
@@ -96,8 +96,9 @@ function find_unreachable() {
 
     if [ $DO_FULL == 1 ]; then FULLNESS="--full"; fi
 
-    BLOBS=($(git fsck --unreachable --no-reflogs \
-        "${FULLNESS}" --no-progress | sed -ne 's/^unreachable blob //p'))
+    BLOBS=($(git fsck --unreachable --no-reflogs "${FULLNESS}" \
+                      --no-progress 2>/dev/null | \
+             sed -E -ne 's/^unreachable blob |dangling blob //p'))
 }
 
 function read_one_file {

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,9 @@ function find_unreachable() {`
`96`	`96`
`97`	`97`	`if [ $DO_FULL == 1 ]; then FULLNESS="--full"; fi`
`98`	`98`
`99`		`- BLOBS=($(git fsck --unreachable --no-reflogs \`
`100`		`- "${FULLNESS}" --no-progress \| sed -ne 's/^unreachable blob //p'))`
	`99`	`+ BLOBS=($(git fsck --unreachable --no-reflogs "${FULLNESS}" \`
	`100`	`+ --no-progress 2>/dev/null \| \`
	`101`	`+ sed -E -ne 's/^unreachable blob \|dangling blob //p'))`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`function read_one_file {`