From 5d0807adb2b3adcd00b82c4701ff78314ea075c4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 11 May 2020 16:48:55 -0400 Subject: [PATCH] libxfs-apply: use git am instead of patch 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 Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- tools/libxfs-apply | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxfs-apply b/tools/libxfs-apply index deb9c2258..3258272d6 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.50.1