[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/git-pull-script b/git-pull-script
index d35a4a1b23bb8af7a13cb07937a0d667ee75fde4..fc463260bd9dd07e50494e7cbb39ef6833179ff3 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,15 +1,12 @@
 #!/bin/sh
 #
-# use "$1" or something in a real script, this 
-# just hard-codes it.
-#
-merge_repo=$1
-merge_name=${2:-HEAD}
-
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
 
-echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+git-fetch-script "$@" || exit 1
 
-git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"
+git-resolve-script \
+       "$(cat "$GIT_DIR"/HEAD)" \
+       "$(cat "$GIT_DIR"/FETCH_HEAD)" \
+       "Merge $merge_name"