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=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
   9 branch=${branch#quilt/}
  10 branch=${branch%%/*}
  11
  12 contact=$(sed -n "/     $branch /s/     .*$//p" $control)
  13 greeting=${contact%% *}
  14 [ "${contact%,*}" = "${contact}" ] || greeting="all"
  15
  16 file="$*"
  17
  18 gitk.test --merge -- $file &
  19 [ "$file" ] && gvim $file
  20
  21 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\
  22 %0A\
  23 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."
  24
  25 exit 0