Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git Loading
base: 32de857fb200ca48ae3762e56a1e58370037f0a4
Choose a base ref
...
head repository: git/git Loading
compare: e0d7db7423a91673c001aaa5e580c815ce2f7f92
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Aug 31, 2023

  1. format-patch: --rfc honors what --subject-prefix sets 

    Rather than replacing the configured subject prefix (either through the
git config or command line) entirely with "RFC PATCH", this change
prepends RFC to whatever subject prefix was already in use.

This is useful, for example, when a user is working on a repository that
has a subject prefix considered to disambiguate patches:

	git config format.subjectPrefix 'PATCH my-project'

Prior to this change, formatting patches with --rfc would lose the
'my-project' information.

The data flow for the subject-prefix was that rev.subject_prefix
were to be kept the authoritative version of the subject prefix even
while parsing command line options, and sprefix variable was used as
a temporary area to futz with it.  Now, the parsing code has been
refactored to build the subject prefix into the sprefix variable and
assigns its value at the end to rev.subject_prefix, which makes the
flow easier to grasp.

Signed-off-by: Drew DeVault <sir@cmpwn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @ddevault @gitster
    ddevault authored and gitster committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    e0d7db7 View commit details
    Browse the repository at this point in the history
Loading