Merge branch 'js/bundle'

* js/bundle:
  bundle: reword missing prerequisite error message
  git-bundle: record commit summary in the prerequisite data
  git-bundle: fix 'create --all'
  git-bundle: avoid fork() in verify_bundle()
  git-bundle: assorted fixes
  Add git-bundle: move objects and references by archive

1 files changed, 7 insertions, 0 deletions

diff --git a/git-fetch.sh b/git-fetch.sh
index d230995f6e..59bee5db0f 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -386,8 +386,15 @@ fetch_main () {
     ( : subshell because we muck with IFS
       IFS=" 	$LF"
       (
+	if test -f "$remote" ; then
+	    test -n "$shallow_depth" &&
+		die "shallow clone with bundle is not supported"
+	    git-bundle unbundle "$remote" $rref ||
+	    echo failed "$remote"
+	else
 	  git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref ||
 	  echo failed "$remote"
+	fi
       ) |
       (
 	trap '