diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-29 14:05:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-29 14:05:09 -0800 |
| commit | 8d6240d4c68e2d2aa372a116bdab8bcf3ff6d66b (patch) | |
| tree | 649ae27090e80513e2a3c99c479c1ac6aa6e2ea1 /builtin/branch.c | |
| parent | Merge branch 'ja/doc-commit-markup-updates' (diff) | |
| parent | ref-filter: remove ref_format_clear() (diff) | |
| download | git-8d6240d4c68e2d2aa372a116bdab8bcf3ff6d66b.tar.gz git-8d6240d4c68e2d2aa372a116bdab8bcf3ff6d66b.zip | |
Merge branch 'rs/ref-fitler-used-atoms-value-fix'
"git branch --sort=..." and "git for-each-ref --format=... --sort=..."
did not work as expected with some atoms, which has been corrected.
* rs/ref-fitler-used-atoms-value-fix:
ref-filter: remove ref_format_clear()
ref-filter: move is-base tip to used_atom
ref-filter: move ahead-behind bases into used_atom
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 7c8b4b65b6..c150131bd9 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -473,7 +473,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin if (verify_ref_format(format)) die(_("unable to parse format string")); - filter_ahead_behind(the_repository, format, &array); + filter_ahead_behind(the_repository, &array); ref_array_sort(sorting, &array); if (column_active(colopts)) { @@ -884,7 +884,6 @@ int cmd_branch(int argc, string_list_clear(&output, 0); ref_sorting_release(sorting); ref_filter_clear(&filter); - ref_format_clear(&format); ret = 0; goto out; |