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 deb9c2258ab88dc933cc4f923ece4e2e32f986f3..3258272d6189de17cc95593d4f5604894d65ed5d 100755 (executable)
--- 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