From 1e9c9bbe0572ad9fc60049dd883da19525be14f3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 23 Dec 2021 14:59:44 +0100 Subject: [PATCH] copy-patches: mask some differences in Laszlo's git setup Restore these git defaults: - core.abbrev=9 - -O/dev/null Taken from libguestfs dist-git commit 975798ac9b5e. resolves: rhbz#2034240 Signed-off-by: Laszlo Ersek --- copy-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy-patches.sh b/copy-patches.sh index 23d4fd0..85cf20a 100755 --- a/copy-patches.sh +++ b/copy-patches.sh @@ -36,7 +36,7 @@ git rm -f [0-9]*.patch ||: rm -f [0-9]*.patch # Get the patches. -(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag) +(cd $git_checkout; rm -f [0-9]*.patch; git -c core.abbrev=9 format-patch -O/dev/null -N --submodule=diff $tag) mv $git_checkout/[0-9]*.patch . # Remove any not to be applied.