Silence cpio's "N blocks" output when cloning locally

Pass --quiet to cpio in git-clone to hide the (confusing) "0 blocks" message.
For compatibility with operating systems which might not support GNUisms,
the presence of --quiet is probed for by grepping cpio's --help output.

Signed-off-by: Bryan Donlan <bdonlan@fushizen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-clone.sh b/git-clone.sh
index e98112277839349a47c26e69ce30982604d12d2c..2636159aaa7a6278d9b8fc64b853b319ac8da123 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -310,6 +310,9 @@ yes)
                mkdir -p "$GIT_DIR/objects/info"
                echo "$repo/objects" >>"$GIT_DIR/objects/info/alternates"
        else
                mkdir -p "$GIT_DIR/objects/info"
                echo "$repo/objects" >>"$GIT_DIR/objects/info/alternates"
        else

+               cpio_quiet_flag=""
+               cpio --help 2>&1 | grep -- --quiet >/dev/null && \
+                       cpio_quiet_flag=--quiet

                l= &&
                if test "$use_local_hardlink" = yes
                then
                l= &&
                if test "$use_local_hardlink" = yes
                then


@@ -330,7 +333,8 @@ yes)
                        fi
                fi &&
                cd "$repo" &&
                        fi
                fi &&
                cd "$repo" &&

-               find objects -depth -print | cpio -pumd$l "$GIT_DIR/" || exit 1
+               find objects -depth -print | cpio $cpio_quiet_flag -pumd$l "$GIT_DIR/" || \
+                       exit 1

        fi
        git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" || exit 1
        ;;
        fi
        git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" || exit 1
        ;;