summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-05-05 15:18:03 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-05 21:09:34 -0700
commite330a406cd20cf45a6816929155181c37678bc47 (patch)
tree11ac7373ebac88dd76f2415edeb4d6329e24c055 /log-tree.c
parent3b559eab55693111e0922cd3dd41bfdba2e22989 (diff)
downloadgit-e330a406cd20cf45a6816929155181c37678bc47.tar.gz
Fix --boundary output
"git log --boundary" incorrectly honoured the option only when "left-right" was enabled. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c
index 8797aa14c4..dbd06490f9 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -218,10 +218,10 @@ void show_log(struct rev_info *opt, const char *sep)
stdout);
if (opt->commit_format != CMIT_FMT_ONELINE)
fputs("commit ", stdout);
- if (opt->left_right) {
- if (commit->object.flags & BOUNDARY)
- putchar('-');
- else if (commit->object.flags & SYMMETRIC_LEFT)
+ if (commit->object.flags & BOUNDARY)
+ putchar('-');
+ else if (opt->left_right) {
+ if (commit->object.flags & SYMMETRIC_LEFT)
putchar('<');
else
putchar('>');