git/combine-diff.c, branch v1.6.2

combine-diff.c: use strbuf_readlink()

2008-12-17T21:36:35Z

When showing combined diff using work tree contents, use strbuf_readlink() to read symbolic links. Signed-off-by: Junio C Hamano Acked-by: Linus Torvalds

Always initialize xpparam_t to 0

2008-10-25T19:09:31Z

We're going to be adding some parameters to this, so we can't have any uninitialized data in it. Signed-off-by: Brian Downing Signed-off-by: Junio C Hamano

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

2008-10-12T19:36:19Z

Many call sites use strbuf_init(&foo, 0) to initialize local strbuf variable "foo" which has not been accessed since its declaration. These can be replaced with a static initialization using the STRBUF_INIT macro which is just as readable, saves a function call, and takes up fewer lines. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

Merge branch 'jc/diff-prefix'

2008-09-19T03:30:07Z

* jc/diff-prefix: diff: vary default prefix depending on what are compared

Merge branch 'jc/hide-cr-in-diff-from-less'

2008-09-08T06:45:40Z

* jc/hide-cr-in-diff-from-less: diff: Help "less" hide ^M from the output

diff: vary default prefix depending on what are compared

2008-08-31T03:53:24Z

With a new configuration "diff.mnemonicprefix", "git diff" shows the differences between various combinations of preimage and postimage trees with prefixes different from the standard "a/" and "b/". Hopefully this will make the distinction stand out for some people. "git diff" compares the (i)ndex and the (w)ork tree; "git diff HEAD" compares a (c)ommit and the (w)ork tree; "git diff --cached" compares a (c)ommit and the (i)ndex; "git-diff HEAD:file1 file2" compares an (o)bject and a (w)ork tree entity; "git diff --no-index a b" compares two non-git things (1) and (2). Because these mnemonics now have meanings, they are swapped when reverse diff is in effect and this feature is enabled. Signed-off-by: Junio C Hamano

diff: Help "less" hide ^M from the output

2008-08-31T03:34:45Z

When the tracked contents have CRLF line endings, colored diff output shows "^M" at the end of output lines, which is distracting, even though the pager we use by default ("less") knows to hide them. The problem is that "less" hides a carriage-return only at the end of the line, immediately before a line feed. The colored diff output does not take this into account, and emits four element sequence for each line: - force this color; - the line up to but not including the terminating line feed; - reset color - line feed. By including the carriage return at the end of the line in the second item, we are breaking the smart our pager has in order not to show "^M". This can be fixed by changing the sequence to: - force this color; - the line up to but not including the terminating end-of-line; - reset color - end-of-line. where end-of-line is either a single linefeed or a CRLF pair. When the output is not colored, "force this color" and "reset color" sequences are both empty, so we won't have this problem with or without this patch. Signed-off-by: Junio C Hamano

Merge branch 'maint' to sync with 1.6.0.1

2008-08-24T21:50:44Z

Respect core.autocrlf in combined diff

2008-08-24T06:59:20Z

Fix git-diff to make it produce useful 3-way diffs for merge conflicts in repositories with autocrlf enabled. Otherwise it always reports that the whole file was changed, because it uses the contents from the working tree without necessary conversion. Signed-off-by: Alexander Gavrilov Signed-off-by: Junio C Hamano

xdiff-interface: hide the whole "xdiff_emit_state" business from the caller

2008-08-14T07:30:26Z

This further enhances xdi_diff_outf() interface so that it takes two common parameters: the callback function that processes one line at a time, and a pointer to its application specific callback data structure. xdi_diff_outf() creates its own "xdiff_emit_state" structure and stashes these two away inside it, which is used by the lowest level output function in the xdiff_outf() callchain, consume_one(), to call back to the application layer. With this restructuring, we lift the requirement that the caller supplied callback data structure embeds xdiff_emit_state structure as its first member. Signed-off-by: Junio C Hamano