summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-16 22:17:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-16 22:34:37 (GMT)
commit78fff6ebbafe2d23464a2b059104954bfe8732c7 (patch)
treebc5881117b11df701c08ea2ccb9d195a004d2a49 /git.c
parentcb8f64b4e3f263c113b7a2f156af74b810e969ff (diff)
downloadgit-78fff6ebbafe2d23464a2b059104954bfe8732c7.zip
git-78fff6ebbafe2d23464a2b059104954bfe8732c7.tar.gz
git-78fff6ebbafe2d23464a2b059104954bfe8732c7.tar.bz2
Fixes for option parsing
Make sure "git show" always show the header, regardless of whether there is a diff or not. Also, make sure "always_show_header" actually works, since generate_header only tested it in one out of three return paths. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index c5de8d3..fc4e429 100644
--- a/git.c
+++ b/git.c
@@ -373,6 +373,7 @@ static int cmd_show(int argc, const char **argv, char **envp)
rev.diffopt.recursive = 1;
rev.combine_merges = 1;
rev.dense_combined_merges = 1;
+ rev.always_show_header = 1;
rev.ignore_merges = 0;
rev.no_walk = 1;
return cmd_log_wc(argc, argv, envp, &rev);