Skip to main content

Browse the archive

Staging
v0.8.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 392809702016cde59d50a7b07e8c27f6d0ec3c3f authored by Junio C Hamano on 28 August 2008, 02:48:01 UTC, committed by Junio C Hamano on 31 August 2008, 03:34:45 UTC 
diff: Help "less" hide ^M from the output
 
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 <gitster@pobox.com>
1 parent bbb896d
Raw File
Tip revision: 392809702016cde59d50a7b07e8c27f6d0ec3c3f authored by Junio C Hamano on 28 August 2008, 02:48:01 UTC
diff: Help "less" hide ^M from the output
Tip revision: 3928097
test-match-trees.c 
#include "cache.h"
#include "tree.h"

int main(int ac, char **av)
{
	unsigned char hash1[20], hash2[20], shifted[20];
	struct tree *one, *two;

	if (get_sha1(av[1], hash1))
		die("cannot parse %s as an object name", av[1]);
	if (get_sha1(av[2], hash2))
		die("cannot parse %s as an object name", av[2]);
	one = parse_tree_indirect(hash1);
	if (!one)
		die("not a treeish %s", av[1]);
	two = parse_tree_indirect(hash2);
	if (!two)
		die("not a treeish %s", av[2]);

	shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
	printf("shifted: %s\n", sha1_to_hex(shifted));

	exit(0);
}
back to top