git.ozlabs.org Git - next-scripts/blob - merge_msg

   1 #!/bin/bash
   2
   3 log=../merge.log
   4 [ -f merge.log ] && log=merge.log
   5 control=../real_control
   6 [ -f real_control ] && control=real_control
   7
   8 branch=""
   9 [ "$1" = "-t" ] && {
  10         branch=$2
  11         shift 2
  12 }
  13
  14 [ "$branch" ] || {
  15         branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
  16         branch=${branch#quilt/}
  17         branch=${branch%%/*}
  18 }
  19
  20 contact=$(awk -F '      ' '$3=="'"$branch"'" { print $1; }' $control)
  21 greeting=${contact%% *}
  22 greeting=${greeting#\"}
  23 [ "${contact%,*}" = "${contact}" ] || greeting="all"
  24
  25 file="$*"
  26
  27 gitk --merge -- $file &
  28 [ "$file" ] && gvim $file
  29
  30 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
  31 %0A\
  32 Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
  33
  34 exit 0