|
|
|
@ -5,7 +5,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
. git-sh-setup-script || die "Not a git archive." |
|
|
|
. git-sh-setup-script || die "Not a git archive." |
|
|
|
|
|
|
|
|
|
|
|
usage="usage: $0 "'<upstream> [<head>] |
|
|
|
usage="usage: $0 "'[-v] <upstream> [<head>] |
|
|
|
|
|
|
|
|
|
|
|
__*__*__*__*__> <upstream> |
|
|
|
__*__*__*__*__> <upstream> |
|
|
|
/ |
|
|
|
/ |
|
|
|
@ -29,6 +29,8 @@ The output is intended to be used as: |
|
|
|
done |
|
|
|
done |
|
|
|
' |
|
|
|
' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case "$1" in -v) verbose=t; shift ;; esac |
|
|
|
|
|
|
|
|
|
|
|
case "$#,$1" in |
|
|
|
case "$#,$1" in |
|
|
|
1,*..*) |
|
|
|
1,*..*) |
|
|
|
upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') |
|
|
|
upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') |
|
|
|
@ -83,6 +85,10 @@ do |
|
|
|
else |
|
|
|
else |
|
|
|
sign=+ |
|
|
|
sign=+ |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
case "$verbose" in |
|
|
|
|
|
|
|
t) |
|
|
|
|
|
|
|
c=$(git-rev-list --pretty=oneline --max-count=1 $c) |
|
|
|
|
|
|
|
esac |
|
|
|
case "$O" in |
|
|
|
case "$O" in |
|
|
|
'') O="$sign $c" ;; |
|
|
|
'') O="$sign $c" ;; |
|
|
|
*) O="$sign $c$LF$O" ;; |
|
|
|
*) O="$sign $c$LF$O" ;; |
|
|
|
|
Junio C Hamano
20 years ago