From: Christoph Hellwig <hch@lst.de>
Date: Mon, 11 May 2020 20:48:55 +0000 (-0400)
Subject: libxfs-apply: use git am instead of patch
X-Git-Tag: xfsprogs-5.7-fixes_2020-06-25~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d0807adb2b3adcd00b82c4701ff78314ea075c4;p=thirdparty%2Fxfsprogs-dev.git

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 <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

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