Skip to main content

Browse the archive

Revision c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a authored by Junio C Hamano on 27 February 2018, 18:43:54 UTC, committed by Junio C Hamano on 27 February 2018, 18:43:54 UTC 
Merge branch 'ab/commit-m-with-fixup' into maint
 
"git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* ab/commit-m-with-fixup:
  commit: add support for --fixup <commit> -m"<extra message>"
  commit doc: document that -c, -C, -F and --fixup with -m error
2 parent s 12accdc + 30884c9
Raw File
t0022-crlf-rename.sh 
#!/bin/sh

test_description='ignore CR in CRLF sequence while computing similiarity'

. ./test-lib.sh

test_expect_success setup '

	cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
	git add sample &&

	test_tick &&
	git commit -m Initial &&

	append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
	git add elpmas &&
	rm -f sample &&

	test_tick &&
	git commit -a -m Second

'

test_expect_success 'diff -M' '

	git diff-tree -M -r --name-status HEAD^ HEAD |
	sed -e "s/R[0-9]*/RNUM/" >actual &&
	echo "RNUM	sample	elpmas" >expect &&
	test_cmp expect actual

'

test_done
back to top