From e1f49fc4946f45c2690239b0b2ca5416d1e0cf52 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 25 Nov 2022 15:49:31 +0000 Subject: [PATCH] disable more features when using 'git format-patch' In my .gitconfig I have this: [format] useAutoBase = true thread = shallow As a consequence, when I run generate-patches-from-git-repo.sh I see two problems, first, I see lots of errors like this: fatal: failed to get upstream, if you want to record base commit automatically, please use git branch --set-upstream-to to track a remote branch. Or you could specify base commit by --base= manually These are caused by the use of the useAutoBase option. If I disable useAutoBase, and regenerate the patches, I see that every patch changes, with the addition of a line like this: Message-Id: This is caused by the use of the thread option. Rather than forcing me to not have these settings in my .gitconfig, I propose that we add --no-base and --no-thread to our invocation of 'git format-patch' in generate-patches-from-git-repo.sh, this fixes both of the above problems. With these new options the 'git format-patch' line was getting pretty long, so I've wrapped it to make it more readable. --- generate-patches-from-git-repo.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generate-patches-from-git-repo.sh b/generate-patches-from-git-repo.sh index 7947c8a..52537ca 100755 --- a/generate-patches-from-git-repo.sh +++ b/generate-patches-from-git-repo.sh @@ -83,7 +83,10 @@ 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-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' > $orig_dir/$fname + git format-patch --no-base --no-thread --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' > $orig_dir/$fname (cd $orig_dir && git add $fname) cat >> $temp_PATCH_file <