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
t6015-rev-list-show-all-parents.sh 
#!/bin/sh

test_description='--show-all --parents does not rewrite TREESAME commits'

. ./test-lib.sh

test_expect_success 'set up --show-all --parents test' '
	test_commit one foo.txt &&
	commit1=$(git rev-list -1 HEAD) &&
	test_commit two bar.txt &&
	commit2=$(git rev-list -1 HEAD) &&
	test_commit three foo.txt &&
	commit3=$(git rev-list -1 HEAD)
	'

test_expect_success '--parents rewrites TREESAME parents correctly' '
	echo $commit3 $commit1 > expected &&
	echo $commit1 >> expected &&
	git rev-list --parents HEAD -- foo.txt > actual &&
	test_cmp expected actual
	'

test_expect_success '--parents --show-all does not rewrites TREESAME parents' '
	echo $commit3 $commit2 > expected &&
	echo $commit2 $commit1 >> expected &&
	echo $commit1 >> expected &&
	git rev-list --parents --show-all HEAD -- foo.txt > actual &&
	test_cmp expected actual
	'

test_done
back to top