OASIS Mailing List ArchivesView the OASIS mailing list archive below
or browse/search using MarkMail.

 


Help: OASIS Mailing Lists Help | MarkMail Help

virtio-dev message

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]


Subject: Re: [PATCH v8 12/16] makediff: update to show diff from master


On Fri, 16 Feb 2018 09:25:40 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  makediff.sh | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/makediff.sh b/makediff.sh
> index 1dd75d4..2ef92fc 100755
> --- a/makediff.sh
> +++ b/makediff.sh
> @@ -9,7 +9,7 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`}
>  MAIN=$1
>  PATH=.:${PATH}
>  cur="$PWD"
> -oldrev=`git rev-list -1 origin/tags/v1.0-cs03`
> +oldrev=`git rev-list -1 origin/master`
>  newrev=`git rev-list -1 HEAD`
>  rm -fr old new
>  git clone $PWD old
> @@ -19,7 +19,6 @@ while read -r rev; do
>  	echo "Applying $rev"
>  	git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1
>  done << 'EOF'
> -headerfile: rename virtio_ring to virtio queue
>  EOF
>  
>  #mv specvars.tex specvars-orig.tex

So, this script is now always supposed to be run on a branch to get the
diff to master?


[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]