diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-11 16:48:55 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2020-05-11 16:48:55 -0400 |
| commit | 5d0807adb2b3adcd00b82c4701ff78314ea075c4 (patch) | |
| tree | c826753c15c74f1c272cce4959566b764f9ff67a /tools | |
| parent | f19a627b52382ec7d6efff4207d03d8ab5597d85 (diff) | |
| download | xfsprogs-dev-5d0807adb2b3adcd00b82c4701ff78314ea075c4.tar.gz | |
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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/libxfs-apply | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxfs-apply b/tools/libxfs-apply index deb9c2258a..3258272d61 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 |