show-branch: --no-sparse should give dense output
"git show-branch --no-sparse" behaved exactly the same way as "git show-branch --sparse", which did not make any sense. This was because it used a variable "dense" initialized to 1 by default to give "non sparse" behaviour, and OPT_SET_INT() to set the varilable to 0 in response to the "--sparse" option. Unfortunately, OPT_SET_INT() sets 0 to the given variable when the option is negated. Flip the polarity of the variable "dense" by renaming it to "sparse" and initializing it to 0, and have OPT_SET_INT() set the variable to 1 when "--sparse" is given. This way, "--no-sparse" would set 0 to the variable and would give us the "dense" behaviour. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 19, 2023 at 04:37 UTC
83bb8e5a0689e236f06a24ffede0b4c823b4a0b2
2 files changed
+20
-4
builtin/show-branch.c
+4
-4
@@ -645,7 +645,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
645
int with_current_branch = 0;
646
int head_at = -1;
647
int topics = 0;
648
- int dense = 1;
648
+ int sparse = 0;
649
const char *reflog_base = NULL;
650
struct option builtin_show_branch_options[] = {
651
OPT_BOOL('a', "all", &all_heads,
@@ -672,8 +672,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
672
REV_SORT_IN_GRAPH_ORDER),
673
OPT_BOOL(0, "topics", &topics,
674
N_("show only commits not on the first branch")),
675
- OPT_SET_INT(0, "sparse", &dense,
676
- N_("show merges reachable from only one tip"), 0),
675
+ OPT_SET_INT(0, "sparse", &sparse,
676
+ N_("show merges reachable from only one tip"), 1),
677
OPT_SET_INT(0, "date-order", &sort_order,
678
N_("topologically sort, maintaining date order "
679
"where possible"),
@@ -936,7 +936,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
936
!is_merge_point &&
937
(this_flag & (1u << REV_SHIFT)))
938
continue;
939
- if (dense && is_merge &&
939
+ if (!sparse && is_merge &&
940
omit_in_dense(commit, rev, num_rev))
941
continue;
942
for (i = 0; i < num_rev; i++) {
t/t3202-show-branch.sh
+16
@@ -119,6 +119,22 @@ test_expect_success 'show branch --remotes' '
119
test_must_be_empty actual.out
120
'
121
122
+test_expect_success 'show-branch --sparse' '
123
+ test_when_finished "git checkout branch10 && git branch -D branchA" &&
124
+ git checkout -b branchA branch10 &&
125
+ git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
126
+ git commit --allow-empty -m "another" &&
127
+
128
+ git show-branch --sparse >out &&
129
+ grep "merge 1 and 10 to make A" out &&
130
+
131
+ git show-branch >out &&
132
+ ! grep "merge 1 and 10 to make A" out &&
133
+
134
+ git show-branch --no-sparse >out &&
135
+ ! grep "merge 1 and 10 to make A" out
136
+'
137
+
138
test_expect_success 'setup show branch --list' '
139
sed "s/^> //" >expect <<-\EOF
140
> [branch1] branch1