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

Commits on Jul 24, 2023

  1. ref-filter: add multiple-option parsing functions 

    The functions

	match_placeholder_arg_value()
	match_placeholder_bool_arg()

were added in pretty 4f732e0 (pretty: allow %(trailers) options
with explicit value, 2019-01-29) to parse multiple options in an
argument to --pretty. For example,

	git log --pretty="%(trailers:key=Signed-Off-By,separator=%x2C )"

will output all the trailers matching the key and seperates them by
a comma followed by a space per commit.

Add similar functions,

	match_atom_arg_value()
	match_atom_bool_arg()

in ref-filter.

There is no atom yet that can use these functions in ref-filter, but we
are going to add a new %(describe) atom in a subsequent commit where we
parse options like tags=<bool-value> or match=<pattern> given to it.

Helped-by: Junio C Hamano <[email protected]>
Mentored-by: Christian Couder <[email protected]>
Mentored-by: Hariom Verma <[email protected]>
Signed-off-by: Kousik Sanagavarapu <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @five-sh @gitster
    five-sh authored and gitster committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f46094a View commit details
    Browse the repository at this point in the history

  2. ref-filter: add new "describe" atom 

    Duplicate the logic of %(describe) and friends from pretty to
ref-filter. In the future, this change helps in unifying both the
formats as ref-filter will be able to do everything that pretty is doing
and we can have a single interface.

The new atom "describe" and its friends are equivalent to the existing
pretty formats with the same name.

Helped-by: Junio C Hamano <[email protected]>
Mentored-by: Christian Couder <[email protected]>
Mentored-by: Hariom Verma <[email protected]>
Signed-off-by: Kousik Sanagavarapu <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @five-sh @gitster
    five-sh authored and gitster committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f5d18f8 View commit details
    Browse the repository at this point in the history
Loading