git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/8] diff.c: simplify caller of emit_line_0

From
Stefan Beller <sbeller@google.com>
Date
Jul 31, 2018, 00:31 UTC
Message-ID
<20180731003141.105192-4-sbeller@google.com>
In-Reply-To
<20180731003141.105192-1-sbeller@google.com>
Due to the previous condition we know "set_sign != NULL" at that point.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 diff.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 272b0b93834..f7251c89cbb 100644
--- a/diff.c
+++ b/diff.c
@@ -997,8 +997,7 @@ static void emit_line_ws_markup(struct diff_options *o,
 		emit_line_0(o, set, 0, reset, sign, line, len);
 	else if (!ws) {
 		/* Emit just the prefix, then the rest. */
-		emit_line_0(o, set_sign ? set_sign : set, !!set_sign, reset,
-			    sign, "", 0);
+		emit_line_0(o, set_sign, !!set_sign, reset, sign, "", 0);
 		emit_line_0(o, set, 0, reset, 0, line, len);
 	} else if (blank_at_eof)
 		/* Blank line at EOF - paint '+' as well */

-- 
2.18.0.132.g195c49a2227
Previous: Junio C HamanoNext: Stefan Beller
Message 18 of 26 in “Add color test for range-diff, simplify diff.c”
  1. 0/8 Add color test for range-diff, simplify diff.cStefan Beller, Jul 28, 2018
  2. 1/8 test_decode_color: understand FAINT and ITALICStefan Beller, Jul 28, 2018
  3. 2/8 t3206: add color test for range-diff --dual-colorStefan Beller, Jul 28, 2018
  4. Eric SunshineJul 28, 2018
  5. Stefan BellerJul 30, 2018
  6. 3/8 diff.c: simplify caller of emit_line_0Stefan Beller, Jul 28, 2018
  7. 4/8 diff.c: reorder arguments for emit_line_ws_markupStefan Beller, Jul 28, 2018
  8. 5/8 diff.c: add set_sign to emit_line_0Stefan Beller, Jul 28, 2018
  9. Eric SunshineJul 28, 2018
  10. 6/8 diff: use emit_line_0 once per lineStefan Beller, Jul 28, 2018
  11. 7/8 diff.c: compute reverse locally in emit_line_0Stefan Beller, Jul 28, 2018
  12. 8/8 diff.c: rewrite emit_line_0 more understandablyStefan Beller, Jul 28, 2018
  13. Eric SunshineJul 28, 2018
  14. 0/8 Add color test for range-diff, simplify diff.cStefan Beller, Jul 31, 2018
  15. 1/8 test_decode_color: understand FAINT and ITALICStefan Beller, Jul 31, 2018
  16. 2/8 t3206: add color test for range-diff --dual-colorStefan Beller, Jul 31, 2018
  17. Junio C HamanoJul 31, 2018
  18. 3/8 diff.c: simplify caller of emit_line_0Stefan Beller, Jul 31, 2018
  19. 4/8 diff.c: reorder arguments for emit_line_ws_markupStefan Beller, Jul 31, 2018
  20. 5/8 diff.c: add set_sign to emit_line_0Stefan Beller, Jul 31, 2018
  21. 6/8 diff: use emit_line_0 once per lineStefan Beller, Jul 31, 2018
  22. 7/8 diff.c: compute reverse locally in emit_line_0Stefan Beller, Jul 31, 2018
  23. 8/8 diff.c: rewrite emit_line_0 more understandablyStefan Beller, Jul 31, 2018
  24. Junio C HamanoAug 1, 2018
  25. Stefan BellerAug 1, 2018
  26. Junio C HamanoAug 2, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.