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
  19 case "${1:-.}${2:-.}${3:-.}" in
  20 #
  21 # Deleted in both.
  22 #
  23 "$1..")
  24         echo "WARNING: $4 is removed in both branches."
  25         echo "WARNING: This is a potential rename conflict."
  26         exec git-update-cache --remove -- "$4"
  27         ;;
  28
  29 #
  30 # Deleted in one and unchanged in the other.
  31 #
  32 "$1.$1" | "$1$1.")
  33         echo "Removing $4"
  34         exec rm -f -- "$4" &&
  35                 git-update-cache --remove -- "$4"
  36         ;;
  37
  38 #
  39 # Added in one.
  40 #
  41 ".$2." | "..$3" )
  42         case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
  43         echo "Adding $4 with perm $mode."
  44         exec git-cat-file blob "$2$3" >"$4" &&
  45                 chmod $mode -- "$4" &&
  46                 git-update-cache --add -- "$4"
  47         ;;
  48
  49 #
  50 # Added in both (check for same permissions).
  51 #
  52 ".$3$2")
  53         if [ "$6" != "$7" ]; then
  54                 echo "ERROR: File $4 added identically in both branches,"
  55                 echo "ERROR: but permissions conflict $6->$7."
  56                 exit 1
  57         fi
  58         case "$6" in *7??) mode=+x;; *) mode=-x;; esac
  59         echo "Adding $4 with perm $mode"
  60         exec git-cat-file blob "$2" >"$4" &&
  61                 chmod $mode -- "$4" &&
  62                 git-update-cache --add -- "$4"
  63         ;;
  64
  65 #
  66 # Modified in both, but differently.
  67 #
  68 "$1$2$3")
  69         echo "Auto-merging $4."
  70         orig=`git-unpack-file $1`
  71         src1=`git-unpack-file $2`
  72         src2=`git-unpack-file $3`
  73
  74         merge -p "$src1" "$orig" "$src2" > "$4"
  75         ret=$?
  76         rm -f -- "$orig" "$src1" "$src2"
  77
  78         if [ "$6" != "$7" ]; then
  79                 echo "ERROR: Permissions conflict: $5->$6,$7."
  80                 ret=1
  81         fi
  82         case "$6" in *7??) mode=+x;; *) mode=-x;; esac
  83         chmod "$mode" "$4"
  84
  85         if [ $ret -ne 0 ]; then
  86                 # Reset the index to the first branch, making
  87                 # git-diff-file useful
  88                 git-update-cache --add --cacheinfo "$6" "$2" "$4"
  89                 echo "ERROR: Merge conflict in $4."
  90                 exit 1
  91         fi
  92         exec git-update-cache --add -- "$4"
  93         ;;
  94
  95 *)
  96         echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
  97         ;;
  98 esac
  99 exit 1