All of lore.kernel.org
 help / color / mirror / Atom feed
From: cem@kernel.org
To: linux-xfs@vger.kernel.org
Cc: djwong@kernel.org, david@fromorbit.com, sandeen@sandeen.net
Subject: [PATCH 1/2] libxf-apply: Ignore Merge commits
Date: Mon, 20 Nov 2023 16:10:46 +0100	[thread overview]
Message-ID: <20231120151056.710510-1-cem@kernel.org> (raw)

From: Carlos Maiolino <cem@kernel.org>

Merge commits in the kernel tree, only polutes the patch list to be
imported into libxfs, explicitly ignore them.

Signed-off-by: Carlos Maiolino <cem@kernel.org>
---

I'm considering here my own usecase, I never used merge commits, and sometimes
they break the synchronization, so they make no good for me during libxfs-sync.

 tools/libxfs-apply | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxfs-apply b/tools/libxfs-apply
index 097a695f9..aa2530f4d 100755
--- a/tools/libxfs-apply
+++ b/tools/libxfs-apply
@@ -445,8 +445,8 @@ fi
 
 # grab and echo the list of commits for confirmation
 echo "Commits to apply:"
-commit_list=`git rev-list $hashr | tac`
-git log --oneline $hashr |tac
+commit_list=`git rev-list --no-merges $hashr | tac`
+git log --oneline --no-merges $hashr |tac
 read -r -p "Proceed [y|N]? " response
 if [ -z "$response" -o "$response" != "y" ]; then
 	fail "Aborted!"
-- 
2.41.0


             reply	other threads:[~2023-11-20 15:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-20 15:10 cem [this message]
2023-11-20 15:10 ` [PATCH 2/2] libxfs-apply: Add option to only import patches into guilt stack cem
2023-11-20 16:49   ` Darrick J. Wong
2023-11-20 18:21     ` Carlos Maiolino
2023-11-20 16:51 ` [PATCH 1/2] libxf-apply: Ignore Merge commits Darrick J. Wong
2023-11-20 18:23   ` Carlos Maiolino
2023-11-20 19:50 ` [RFC PATCH 3/2] libxfs-apply: allow stgit users to force-apply a patch Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231120151056.710510-1-cem@kernel.org \
    --to=cem@kernel.org \
    --cc=david@fromorbit.com \
    --cc=djwong@kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.