Andrew's git - gitweb.git/blob - git-merge-one-file-script

   1#!/bin/sh
   2#
   3# Copyright (c) Linus Torvalds, 2005
   4#
   5# This is the git per-file merge script, called with
   6#
   7#   $1 - original file SHA1 (or empty)
   8#   $2 - file in branch1 SHA1 (or empty)
   9#   $3 - file in branch2 SHA1 (or empty)
  10#   $4 - pathname in repository
  11#   $5 - orignal file mode (or empty)
  12#   $6 - file in branch1 mode (or empty)
  13#   $7 - file in branch2 mode (or empty)
  14#
  15# Handle some trivial cases.. The _really_ trivial cases have
  16# been handled already by git-read-tree, but that one doesn't
  17# do any merges that might change the tree layout.
  18
  19verify_path() {
  20    file="$1"
  21    dir=`dirname "$file"` &&
  22    mkdir -p "$dir" &&
  23    rm -f -- "$file" &&
  24    : >"$file"
  25}
  26
  27case "${1:-.}${2:-.}${3:-.}" in
  28#
  29# Deleted in both.
  30#
  31"$1..")
  32        echo "WARNING: $4 is removed in both branches."
  33        echo "WARNING: This is a potential rename conflict."
  34        rm -f -- "$4" &&
  35                exec git-update-cache --remove -- "$4"
  36        ;;
  37
  38#
  39# Deleted in one and unchanged in the other.
  40#
  41"$1.$1" | "$1$1.")
  42        echo "Removing $4"
  43        rm -f -- "$4" &&
  44                exec git-update-cache --remove -- "$4"
  45        ;;
  46
  47#
  48# Added in one.
  49#
  50".$2." | "..$3" )
  51        case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
  52        echo "Adding $4 with perm $mode."
  53        verify_path "$4" &&
  54                git-cat-file blob "$2$3" >"$4" &&
  55                chmod $mode -- "$4" &&
  56                exec git-update-cache --add -- "$4"
  57        ;;
  58
  59#
  60# Added in both (check for same permissions).
  61#
  62".$3$2")
  63        if [ "$6" != "$7" ]; then
  64                echo "ERROR: File $4 added identically in both branches,"
  65                echo "ERROR: but permissions conflict $6->$7."
  66                exit 1
  67        fi
  68        case "$6" in *7??) mode=+x;; *) mode=-x;; esac
  69        echo "Adding $4 with perm $mode"
  70        verify_path "$4" &&
  71                git-cat-file blob "$2" >"$4" &&
  72                chmod $mode -- "$4" &&
  73                exec git-update-cache --add -- "$4"
  74        ;;
  75
  76#
  77# Modified in both, but differently.
  78#
  79"$1$2$3")
  80        echo "Auto-merging $4."
  81        orig=`git-unpack-file $1`
  82        src1=`git-unpack-file $2`
  83        src2=`git-unpack-file $3`
  84
  85        verify_path "$4" &&
  86                merge -p "$src1" "$orig" "$src2" > "$4"
  87        ret=$?
  88        rm -f -- "$orig" "$src1" "$src2"
  89
  90        if [ "$6" != "$7" ]; then
  91                echo "ERROR: Permissions conflict: $5->$6,$7."
  92                ret=1
  93        fi
  94        case "$6" in *7??) mode=+x;; *) mode=-x;; esac
  95        chmod "$mode" "$4"
  96
  97        if [ $ret -ne 0 ]; then
  98                # Reset the index to the first branch, making
  99                # git-diff-file useful
 100                git-update-cache --add --cacheinfo "$6" "$2" "$4"
 101                echo "ERROR: Merge conflict in $4."
 102                exit 1
 103        fi
 104        exec git-update-cache --add -- "$4"
 105        ;;
 106
 107*)
 108        echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
 109        ;;
 110esac
 111exit 1