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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15d9f3dc66
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf8e65b30b
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 16, 2019

  1. format-patch: replace erroneous and condition 

    Commit 30984ed (format-patch: support deep threading, 2009-02-19),
introduced the following lines:

	#define THREAD_SHALLOW 1

	[...]

	thread = git_config_bool(var, value) && THREAD_SHALLOW;

Since git_config_bool() returns a bool, the trailing `&& THREAD_SHALLOW`
is a no-op. Replace this errorneous and condition with a ternary
statement so that it is clear what the configured value is when a
boolean is given.

Signed-off-by: Denton Liu <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @Denton-L @gitster
    Denton-L authored and gitster committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    46273df View commit details
    Browse the repository at this point in the history

  2. format-patch: use enum variables 

    Before, `thread` and `config_cover_letter` were defined as ints even
though they behaved as enums. Define actual enums and change these
variables to use these new definitions.

Signed-off-by: Denton Liu <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @Denton-L @gitster
    Denton-L authored and gitster committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    a92331d View commit details
    Browse the repository at this point in the history

  3. format-patch: teach --cover-from-description option 

    Before, when format-patch generated a cover letter, only the body would
be populated with a branch's description while the subject would be
populated with placeholder text. However, users may want to have the
subject of their cover letter automatically populated in the same way.

Teach format-patch to accept the `--cover-from-description` option and
corresponding `format.coverFromDescription` config, allowing users to
populate different parts of the cover letter (including the subject
now).

Signed-off-by: Denton Liu <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @Denton-L @gitster
    Denton-L authored and gitster committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    bf8e65b View commit details
    Browse the repository at this point in the history
Loading