Skip to content

Commit e1803b4

Browse files
Michael J Grubermjg
authored andcommitted
builtin/show: do not prune by pathspec
By design, "git show commit -- path" is not "git show commit:path", and there is no reason to change that. But "git show commit -- path" simply returns nothing at all "most of the time" because it prunes by pathspec even though it does not walk commits. This is pretty useless. So, turn off commit pruning (but keep diff limiting of course) so that "git show commit -- path" shows the commit message and the diff that the commit introduces to path (filtered by path); only the diff will be empty "most of the time". As an intended side effect, users mistaking "git show commit -- path" for "git show commit:path" are automatically reminded that they asked git to show a commit, not a blob. In case the user has specified "--do-walk", assume they want the old behaviour (prune by default).
1 parent d0cf55e commit e1803b4

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

builtin/log.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,8 @@ int cmd_show(int argc,
692692
opt.def = "HEAD";
693693
opt.tweak = show_setup_revisions_tweak;
694694
cmd_log_init(argc, argv, prefix, &rev, &opt, &cfg);
695+
if (rev.no_walk)
696+
rev.prune = 0;
695697

696698
if (!rev.no_walk) {
697699
ret = cmd_log_walk(&rev);

0 commit comments

Comments
 (0)