Andrew's git - gitweb.git/blob - git-resolve-script

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Linus Torvalds
   4#
   5# Resolve two trees.
   6#
   7head="$1"
   8merge="$2"
   9merge_repo="$3"
  10
  11: ${GIT_DIR=.git}
  12: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
  13
  14rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
  15echo $head > "$GIT_DIR"/ORIG_HEAD
  16echo $merge > "$GIT_DIR"/MERGE_HEAD
  17
  18#
  19# The remote name is just used for the message,
  20# but we do want it.
  21#
  22if [ "$merge_repo" == "" ]; then
  23        echo "git-resolve-script <head> <remote> <merge-repo-name>"
  24        exit 1
  25fi
  26
  27common=$(git-merge-base $head $merge)
  28if [ -z "$common" ]; then
  29        echo "Unable to find common commit between" $merge $head
  30        exit 1
  31fi
  32
  33if [ "$common" == "$merge" ]; then
  34        echo "Already up-to-date. Yeeah!"
  35        exit 0
  36fi
  37if [ "$common" == "$head" ]; then
  38        echo "Updating from $head to $merge."
  39        git-read-tree -u -m $head $merge || exit 1
  40        echo $merge > "$GIT_DIR"/HEAD
  41        git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
  42        exit 0
  43fi
  44echo "Trying to merge $merge into $head"
  45git-read-tree -u -m $common $head $merge || exit 1
  46merge_msg="Merge $merge_repo"
  47result_tree=$(git-write-tree  2> /dev/null)
  48if [ $? -ne 0 ]; then
  49        echo "Simple merge failed, trying Automatic merge"
  50        git-merge-cache -o git-merge-one-file-script -a
  51        if [ $? -ne 0 ]; then
  52                echo "Automatic merge failed, fix up by hand"
  53                exit 1
  54        fi
  55        result_tree=$(git-write-tree) || exit 1
  56fi
  57result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
  58echo "Committed merge $result_commit"
  59echo $result_commit > "$GIT_DIR"/HEAD
  60git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat