From 03ff51b230185c883aae69a462b97d4f9794c28f Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Wed, 8 Apr 2020 16:25:25 -0400 Subject: [PATCH] Fix generate-patches-from-git-repo.sh's use of "--keep-subject". --- generate-patches-from-git-repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-patches-from-git-repo.sh b/generate-patches-from-git-repo.sh index faa64a2..f4b3326 100755 --- a/generate-patches-from-git-repo.sh +++ b/generate-patches-from-git-repo.sh @@ -75,7 +75,7 @@ for c in `git rev-list --reverse ${common_ancestor}..HEAD` ; do # before, even if nothing has changed. This is bad, so we replace # the commit hash by something constant (the string # "FEDORA_PATCHES"). - git format-patch --no-signature --no-stat --keep -1 --stdout $c | sed -e '1 s/^From [0-9a-f]\+ \(.*\)/From FEDORA_PATCHES \1/' -e '/^index [0-9a-f]\+\.\.[0-9a-f]\+.*$/d' > ../$fname + git format-patch --no-signature --no-stat --keep-subject -1 --stdout $c | sed -e '1 s/^From [0-9a-f]\+ \(.*\)/From FEDORA_PATCHES \1/' -e '/^index [0-9a-f]\+\.\.[0-9a-f]\+.*$/d' > ../$fname (cd .. && git add $fname) cat >> $temp_PATCH_file <