Commit Diff

Commit:
a8fa2ba8469e013475c403304989843b7fc17ae8
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: maintscripts: reverse cherrypicks When cherry-picking commits from main, do so in reverse order so they match more linearly with main.
Actions:
Patch | Tree
commit - e4badaa9b90e135ea0f13cd89fafdcdbf2ea8a83
commit + a8fa2ba8469e013475c403304989843b7fc17ae8
blob - b9b28940516279fa27c10e23a36ffb45872c8ee5
blob + d7de13a739baefc5fa4da6858ed286ea21e1e9a3
--- maintscripts/sync-upstream.sh
+++ maintscripts/sync-upstream.sh
@@ -46,8 +46,9 @@ read -p "Proceed? [Y/n]: " resp
 
 [ "$resp" = "N" -o "$resp" = "n" ] && exit
 
-git cherry-pick --no-rerere-autoupdate -Xtheirs \
-	$(git rev-list --first-parent main...origin/main)
+# Pick the commits in reverse order.
+git rev-list --reverse --first-parent main...origin/main | \
+	git cherry-pick --stdin --no-rerere-autoupdate -Xtheirs
 
 [ $? -eq 0 ] && {
 	# Sanity-check header files which are found portably and remove them.