git-cherry.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Junio C Hamano.
   4 #
   5
   6 USAGE='[-v] <upstream> [<head>] [<limit>]'
   7 LONG_USAGE='             __*__*__*__*__> <upstream>
   8             /
   9   fork-point
  10             \__+__+__+__+__+__+__+__> <head>
  11
  12 Each commit between the fork-point (or <limit> if given) and <head> is
  13 examined, and compared against the change each commit between the
  14 fork-point and <upstream> introduces.  If the change seems to be in
  15 the upstream, it is shown on the standard output with prefix "-".
  16 Otherwise it is shown with prefix "+".'
  17 . git-sh-setup
  18
  19 case "$1" in -v) verbose=t; shift ;; esac
  20
  21 case "$#,$1" in
  22 1,*..*)
  23     upstream=$(expr "z$1" : 'z\(.*\)\.\.') ours=$(expr "z$1" : '.*\.\.\(.*\)$')
  24     set x "$upstream" "$ours"
  25     shift ;;
  26 esac
  27
  28 case "$#" in
  29 1) upstream=`git-rev-parse --verify "$1"` &&
  30    ours=`git-rev-parse --verify HEAD` || exit
  31    limit="$upstream"
  32    ;;
  33 2) upstream=`git-rev-parse --verify "$1"` &&
  34    ours=`git-rev-parse --verify "$2"` || exit
  35    limit="$upstream"
  36    ;;
  37 3) upstream=`git-rev-parse --verify "$1"` &&
  38    ours=`git-rev-parse --verify "$2"` &&
  39    limit=`git-rev-parse --verify "$3"` || exit
  40    ;;
  41 *) usage ;;
  42 esac
  43
  44 # Note that these list commits in reverse order;
  45 # not that the order in inup matters...
  46 inup=`git-rev-list ^$ours $upstream` &&
  47 ours=`git-rev-list $ours ^$limit` || exit
  48
  49 tmp=.cherry-tmp$$
  50 patch=$tmp-patch
  51 mkdir $patch
  52 trap "rm -rf $tmp-*" 0 1 2 3 15
  53
  54 for c in $inup
  55 do
  56         git-diff-tree -p $c
  57 done | git-patch-id |
  58 while read id name
  59 do
  60         echo $name >>$patch/$id
  61 done
  62
  63 LF='
  64 '
  65
  66 O=
  67 for c in $ours
  68 do
  69         set x `git-diff-tree -p $c | git-patch-id`
  70         if test "$2" != ""
  71         then
  72                 if test -f "$patch/$2"
  73                 then
  74                         sign=-
  75                 else
  76                         sign=+
  77                 fi
  78                 case "$verbose" in
  79                 t)
  80                         c=$(git-rev-list --pretty=oneline --max-count=1 $c)
  81                 esac
  82                 case "$O" in
  83                 '')     O="$sign $c" ;;
  84                 *)      O="$sign $c$LF$O" ;;
  85                 esac
  86         fi
  87 done
  88 case "$O" in
  89 '') ;;
  90 *)  echo "$O" ;;
  91 esac