From: Christoph Hellwig <hch@lst.de>
To: sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH] libxfs-apply: use git am instead of patch
Date: Sun, 10 May 2020 09:14:55 +0200 [thread overview]
Message-ID: <20200510071455.986111-1-hch@lst.de> (raw)
If neither guilt or stgit are used default to git am instead of patch
so that all the commit information is properly propagated.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tools/libxfs-apply | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/libxfs-apply b/tools/libxfs-apply
index deb9c225..3258272d 100755
--- a/tools/libxfs-apply
+++ b/tools/libxfs-apply
@@ -395,8 +395,8 @@ apply_patch()
fi
fi
else
- echo "Applying with patch utility:"
- patch -p1 < $_new_patch.2
+ echo "Applying with git am:"
+ git am -s $_new_patch.2
echo "Patch was applied in $REPO; check for rejects, etc"
fi
--
2.26.2
next reply other threads:[~2020-05-10 7:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 7:14 Christoph Hellwig [this message]
2020-05-10 14:07 ` [PATCH] libxfs-apply: use git am instead of patch Eric Sandeen
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=20200510071455.986111-1-hch@lst.de \
--to=hch@lst.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox