projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 67cc5c4e LT |
1 | #!/bin/sh |
| 2 | # | |
| 8ac069ac JH |
3 | # Copyright (c) 2005 Linus Torvalds |
| 4 | # | |
| 67cc5c4e LT |
5 | # Resolve two trees. |
| 6 | # | |
| b33e9666 | 7 | |
| 806f36d4 FK |
8 | USAGE='<head> <remote> <merge-message>' |
| 9 | . git-sh-setup | |
| 67cc5c4e | 10 | |
| c591412c | 11 | dropheads() { |
| 6b38a402 | 12 | rm -f -- "$GIT_DIR/MERGE_HEAD" \ |
| c591412c DH |
13 | "$GIT_DIR/LAST_MERGE" || exit 1 |
| 14 | } | |
| 67cc5c4e | 15 | |
| 165e160e JH |
16 | head=$(git-rev-parse --verify "$1"^0) && |
| 17 | merge=$(git-rev-parse --verify "$2"^0) && | |
| 18 | merge_msg="$3" || usage | |
| 19 | ||
| 67cc5c4e LT |
20 | # |
| 21 | # The remote name is just used for the message, | |
| 22 | # but we do want it. | |
| 23 | # | |
| 3ba513c3 | 24 | if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then |
| 165e160e | 25 | usage |
| 67cc5c4e LT |
26 | fi |
| 27 | ||
| c591412c DH |
28 | dropheads |
| 29 | echo $head > "$GIT_DIR"/ORIG_HEAD | |
| 30 | echo $merge > "$GIT_DIR"/LAST_MERGE | |
| 31 | ||
| 67cc5c4e LT |
32 | common=$(git-merge-base $head $merge) |
| 33 | if [ -z "$common" ]; then | |
| b33e9666 | 34 | die "Unable to find common commit between" $merge $head |
| 67cc5c4e LT |
35 | fi |
| 36 | ||
| 86b13da4 JH |
37 | case "$common" in |
| 38 | "$merge") | |
| 67cc5c4e | 39 | echo "Already up-to-date. Yeeah!" |
| c591412c | 40 | dropheads |
| 67cc5c4e | 41 | exit 0 |
| 86b13da4 JH |
42 | ;; |
| 43 | "$head") | |
| 67cc5c4e | 44 | echo "Updating from $head to $merge." |
| 220a0b52 | 45 | git-read-tree -u -m $head $merge || exit 1 |
| bf7960eb | 46 | git-update-ref HEAD "$merge" "$head" |
| 6b38a402 | 47 | git-diff-tree -p $head $merge | git-apply --stat |
| c591412c | 48 | dropheads |
| 67cc5c4e | 49 | exit 0 |
| 86b13da4 JH |
50 | ;; |
| 51 | esac | |
| 9585e406 | 52 | |
| e3b59a44 JH |
53 | # We are going to make a new commit. |
| 54 | git var GIT_COMMITTER_IDENT >/dev/null || exit | |
| 55 | ||
| 9585e406 JH |
56 | # Find an optimum merge base if there are more than one candidates. |
| 57 | LF=' | |
| 58 | ' | |
| 59 | common=$(git-merge-base -a $head $merge) | |
| 60 | case "$common" in | |
| 61 | ?*"$LF"?*) | |
| 62 | echo "Trying to find the optimum merge base." | |
| 63 | G=.tmp-index$$ | |
| 64 | best= | |
| 65 | best_cnt=-1 | |
| 66 | for c in $common | |
| 67 | do | |
| 68 | rm -f $G | |
| 69 | GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \ | |
| 70 | 2>/dev/null || continue | |
| 71 | # Count the paths that are unmerged. | |
| 72 | cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l` | |
| 73 | if test $best_cnt -le 0 -o $cnt -le $best_cnt | |
| 74 | then | |
| 75 | best=$c | |
| 76 | best_cnt=$cnt | |
| 77 | if test "$best_cnt" -eq 0 | |
| 78 | then | |
| 79 | # Cannot do any better than all trivial merge. | |
| 80 | break | |
| 81 | fi | |
| 82 | fi | |
| 83 | done | |
| 84 | rm -f $G | |
| 85 | common="$best" | |
| 86 | esac | |
| 87 | ||
| 88 | echo "Trying to merge $merge into $head using $common." | |
| 215a7ad1 | 89 | git-update-index --refresh 2>/dev/null |
| 220a0b52 | 90 | git-read-tree -u -m $common $head $merge || exit 1 |
| 67cc5c4e LT |
91 | result_tree=$(git-write-tree 2> /dev/null) |
| 92 | if [ $? -ne 0 ]; then | |
| 93 | echo "Simple merge failed, trying Automatic merge" | |
| 215a7ad1 | 94 | git-merge-index -o git-merge-one-file -a |
| e5b905c4 | 95 | if [ $? -ne 0 ]; then |
| c591412c | 96 | echo $merge > "$GIT_DIR"/MERGE_HEAD |
| b33e9666 | 97 | die "Automatic merge failed, fix up by hand" |
| e5b905c4 | 98 | fi |
| 67cc5c4e LT |
99 | result_tree=$(git-write-tree) || exit 1 |
| 100 | fi | |
| d5a72fd6 | 101 | result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) |
| 67cc5c4e | 102 | echo "Committed merge $result_commit" |
| bf7960eb | 103 | git-update-ref HEAD "$result_commit" "$head" |
| 9c065315 | 104 | git-diff-tree -p $head $result_commit | git-apply --stat |
| c591412c | 105 | dropheads |