From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Aug 2017 06:07:13 +0000 (-0700)
Subject: Merge branch 'sb/diff-color-move' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a239d031bc070103de1627bcc2d87e01a6942186

Merge branch 'sb/diff-color-move' into next

"git diff" has been taught to optionally paint new lines that are
the same as deleted lines elsewhere differently from genuinely new
lines.

* sb/diff-color-move: (25 commits)
diff: document the new --color-moved setting
diff.c: add dimming to moved line detection
diff.c: color moved lines differently, plain mode
diff.c: color moved lines differently
diff.c: buffer all output if asked to
diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
diff.c: convert word diffing to use emit_diff_symbol
diff.c: convert show_stats to use emit_diff_symbol
diff.c: convert emit_binary_diff_body to use emit_diff_symbol
submodule.c: migrate diff output to use emit_diff_symbol
diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
diff.c: migrate emit_line_checked to use emit_diff_symbol
diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
...
---

a239d031bc070103de1627bcc2d87e01a6942186
diff --cc submodule.h
index e402b004ff,829d975585..5f26b54049
--- a/submodule.h
+++ b/submodule.h
@@@ -66,17 -63,13 +66,12 @@@ extern int parse_submodule_update_strat
  		struct submodule_update_strategy *dst);
  extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
  extern void handle_ignore_submodules_arg(struct diff_options *, const char *);
- extern void show_submodule_summary(FILE *f, const char *path,
- 		const char *line_prefix,
+ extern void show_submodule_summary(struct diff_options *o, const char *path,
  		struct object_id *one, struct object_id *two,
- 		unsigned dirty_submodule, const char *meta,
- 		const char *del, const char *add, const char *reset);
- extern void show_submodule_inline_diff(FILE *f, const char *path,
- 		const char *line_prefix,
+ 		unsigned dirty_submodule);
+ extern void show_submodule_inline_diff(struct diff_options *o, const char *path,
  		struct object_id *one, struct object_id *two,
- 		unsigned dirty_submodule, const char *meta,
- 		const char *del, const char *add, const char *reset,
- 		const struct diff_options *opt);
+ 		unsigned dirty_submodule);
 -extern void set_config_fetch_recurse_submodules(int value);
  /* Check if we want to update any submodule.*/
  extern int should_update_submodules(void);
  /*