t/t4100/t-apply-2.patch

   1 7ef76925d9c19ef74874e1735e2436e56d0c4897 (from 6b14d7faf0bad026a81a27bac07b47691f621b8f)
   2 diff --git a/Makefile b/Makefile
   3 --- a/Makefile
   4 +++ b/Makefile
   5 @@ -20,7 +20,7 @@ INSTALL=install
   6
   7  SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
   8         git-pull-script git-tag-script git-resolve-script git-whatchanged \
   9 -       git-deltafy-script
  10 +       git-deltafy-script git-fetch-script
  11
  12  PROG=   git-update-index git-diff-files git-init-db git-write-tree \
  13         git-read-tree git-commit-tree git-cat-file git-fsck-cache \
  14 diff --git a/git-pull-script b/git-fetch-script
  15 similarity index 87%
  16 copy from git-pull-script
  17 copy to git-fetch-script
  18 --- a/git-pull-script
  19 +++ b/git-fetch-script
  20 @@ -39,8 +39,3 @@ download_one "$merge_repo/$merge_name" "
  21
  22  echo "Getting object database"
  23  download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
  24 -
  25 -git-resolve-script \
  26 -       "$(cat "$GIT_DIR"/HEAD)" \
  27 -       "$(cat "$GIT_DIR"/MERGE_HEAD)" \
  28 -       "$merge_repo"
  29 diff --git a/git-pull-script b/git-pull-script
  30 --- a/git-pull-script
  31 +++ b/git-pull-script
  32 @@ -6,39 +6,7 @@ merge_name=${2:-HEAD}
  33  : ${GIT_DIR=.git}
  34  : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
  35
  36 -download_one () {
  37 -       # remote_path="$1" local_file="$2"
  38 -       case "$1" in
  39 -       http://*)
  40 -               wget -q -O "$2" "$1" ;;
  41 -       /*)
  42 -               test -f "$1" && cat >"$2" "$1" ;;
  43 -       *)
  44 -               rsync -L "$1" "$2" ;;
  45 -       esac
  46 -}
  47 -
  48 -download_objects () {
  49 -       # remote_repo="$1" head_sha1="$2"
  50 -       case "$1" in
  51 -       http://*)
  52 -               git-http-pull -a "$2" "$1/"
  53 -               ;;
  54 -       /*)
  55 -               git-local-pull -l -a "$2" "$1/"
  56 -               ;;
  57 -       *)
  58 -               rsync -avz --ignore-existing \
  59 -                       "$1/objects/." "$GIT_OBJECT_DIRECTORY"/.
  60 -               ;;
  61 -       esac
  62 -}
  63 -
  64 -echo "Getting remote $merge_name"
  65 -download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
  66 -
  67 -echo "Getting object database"
  68 -download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
  69 +git-fetch-script "$merge_repo" "$merge_name"
  70
  71  git-resolve-script \
  72         "$(cat "$GIT_DIR"/HEAD)" \