diff options
| -rwxr-xr-x | makediff.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makediff.sh b/makediff.sh index 1dd75d4..679e2b6 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 tags/v1.0-cs04` newrev=`git rev-list -1 HEAD` rm -fr old new git clone $PWD old @@ -17,7 +17,7 @@ cd "${cur}/old" git checkout $oldrev while read -r rev; do echo "Applying $rev" - git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 + git cherry-pick --keep-redundant-commits --allow-empty `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 done << 'EOF' headerfile: rename virtio_ring to virtio queue EOF |