[PATCH] pull: gracefully recover from delta retrieval failure.

[git.git] / git-resolve-script

diff --git a/git-resolve-script b/git-resolve-script
index ec646fb..b7ccc20 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -39,9 +39,9 @@ if [ "$common" == "$head" ]; then
        echo "Destroying all noncommitted data!"
        echo "Kill me within 3 seconds.."
        sleep 3
-       git-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh
+       git-read-tree -m $merge && git-checkout-cache -f -u -a
        echo $merge > "$GIT_DIR"/HEAD
-       git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+       git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
        exit 0
 fi
 echo "Trying to merge $merge into $head"
@@ -57,5 +57,5 @@ fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-checkout-cache -f -a && git-update-cache --refresh
-git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+git-checkout-cache -f -u -a
+git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat