Skip to content

Commit 393eee1

Browse files
committed
Merge branch 'jk/cached-commit-buffer' into maint
Code clean-up. * jk/cached-commit-buffer: revision: drop --show-all option commit: drop uses of get_cached_commit_buffer()
2 parents c9bc2c5 + f74bbc8 commit 393eee1

File tree

5 files changed

+1
-46
lines changed

5 files changed

+1
-46
lines changed

builtin/rev-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static void show_commit(struct commit *commit, void *data)
132132
else
133133
putchar('\n');
134134

135-
if (revs->verbose_header && get_cached_commit_buffer(commit, NULL)) {
135+
if (revs->verbose_header) {
136136
struct strbuf buf = STRBUF_INIT;
137137
struct pretty_print_context ctx = {0};
138138
ctx.abbrev = revs->abbrev;

log-tree.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,6 @@ void show_log(struct rev_info *opt)
659659
show_mergetag(opt, commit);
660660
}
661661

662-
if (!get_cached_commit_buffer(commit, NULL))
663-
return;
664-
665662
if (opt->show_notes) {
666663
int raw;
667664
struct strbuf notebuf = STRBUF_INIT;

revision.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,14 +1055,9 @@ static int limit_list(struct rev_info *revs)
10551055
return -1;
10561056
if (obj->flags & UNINTERESTING) {
10571057
mark_parents_uninteresting(commit);
1058-
if (revs->show_all)
1059-
p = &commit_list_insert(commit, p)->next;
10601058
slop = still_interesting(list, date, slop, &interesting_cache);
10611059
if (slop)
10621060
continue;
1063-
/* If showing all, add the whole pending list to the end */
1064-
if (revs->show_all)
1065-
*p = list;
10661061
break;
10671062
}
10681063
if (revs->min_age != -1 && (commit->date > revs->min_age))
@@ -1854,8 +1849,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
18541849
revs->dense = 1;
18551850
} else if (!strcmp(arg, "--sparse")) {
18561851
revs->dense = 0;
1857-
} else if (!strcmp(arg, "--show-all")) {
1858-
revs->show_all = 1;
18591852
} else if (!strcmp(arg, "--in-commit-order")) {
18601853
revs->tree_blobs_in_commit_order = 1;
18611854
} else if (!strcmp(arg, "--remove-empty")) {
@@ -3062,8 +3055,6 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
30623055
return commit_ignore;
30633056
if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
30643057
return commit_ignore;
3065-
if (revs->show_all)
3066-
return commit_show;
30673058
if (commit->object.flags & UNINTERESTING)
30683059
return commit_ignore;
30693060
if (revs->min_age != -1 &&
@@ -3162,7 +3153,6 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
31623153
enum commit_action action = get_commit_action(revs, commit);
31633154

31643155
if (action == commit_show &&
3165-
!revs->show_all &&
31663156
revs->prune && revs->dense && want_ancestry(revs)) {
31673157
/*
31683158
* --full-diff on simplified parents is no good: it

revision.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ struct rev_info {
9090
unsigned int dense:1,
9191
prune:1,
9292
no_walk:2,
93-
show_all:1,
9493
remove_empty_trees:1,
9594
simplify_history:1,
9695
topo_order:1,

t/t6015-rev-list-show-all-parents.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)