[PATCH] diff --color-words -U0: fix the location of hunk headers
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 29, 2009, 10:45 UTC
- Message-ID
- <alpine.DEB.1.00.0910291144170.3687@felix-maschine>
- In-Reply-To
- <1256732672-11817-4-git-send-email-markus.heidelberg@web.de>
Colored word diff without context lines firstly printed all the hunk headers among each other and then printed the diff.
This was due to the code relying on getting at least one context line at the end of each hunk, where the colored words would be flushed (it is done that way to be able to ignore rewrapped lines).
Noticed by Markus Heidelberg.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ---
I would strongly prefer this fix instead of your 2/3 and 3/3.
diff.c | 6 ++++++ t/t4034-diff-words.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c index 51b5dbb..4eafaf5 100644 --- a/diff.c +++ b/diff.c @@ -656,6 +656,12 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) for (i = 0; i < len && line[i] == '@'; i++) ; if (2 <= i && i < len && line[i] == ' ') { + /* flush --color-words even for --unified=0 */ + if (ecbdata->diff_words && + (ecbdata->diff_words->minus.text.size || + ecbdata->diff_words->plus.text.size)) + diff_words_show(ecbdata->diff_words); + ecbdata->nparents = i - 1; len = sane_truncate_line(ecbdata, line, len); emit_line(ecbdata->file, diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 82240cf..21db6e9 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -77,7 +77,7 @@ cat > expect <<\EOF <GREEN>aeff = aeff * ( aaa )<RESET> EOF -test_expect_failure 'word diff without context' ' +test_expect_success 'word diff without context' ' word_diff --color-words --unified=0
-- 1.6.4.GIT