Merge branch 'maint'

diff --git a/git-fetch.sh b/git-fetch.sh
index d230995f6e3033456b670fa60b8a392dbc8dd08f..59bee5db0f0738cd6d43772e7279edf726a0b7d1 100755 (executable)
--- 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 '