From: struggleyb.nku@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH] diff.c: fix a graph output bug
Date: Thu, 8 Jul 2010 23:12:34 +0800 [thread overview]
Message-ID: <4c35eb6c.21078e0a.1455.ffffe42d@mx.google.com> (raw)
In-Reply-To: <y>
From: Bo Yang <struggleyb.nku@gmail.com>
Ouput the line_prefix ahead of color sequence.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
---
diff.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 3aa695d..17873f3 100644
--- a/diff.c
+++ b/diff.c
@@ -2627,8 +2627,7 @@ static void fill_metainfo(struct strbuf *msg,
(!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
abbrev = 40;
}
- strbuf_addf(msg, "%s%sindex %s..", set,
- line_prefix,
+ strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
find_unique_abbrev(one->sha1, abbrev));
strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
if (one->mode == two->mode)
--
1.7.0.2.273.gc2413.dirty
next reply other threads:[~2010-07-08 15:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 15:12 struggleyb.nku [this message]
2010-07-09 0:15 ` [PATCH] diff.c: fix a graph output bug Junio C Hamano
2010-07-09 0:57 ` Junio C Hamano
2010-07-09 1:04 ` Nazri Ramliy
2010-07-09 1:09 ` Junio C Hamano
2010-07-11 6:10 ` Bo Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c35eb6c.21078e0a.1455.ffffe42d@mx.google.com \
--to=struggleyb.nku@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).