Revision 28eec80b602559403cca96531dce2930ac362095 authored by Junio C Hamano on 10 March 2016, 19:13:40 UTC, committed by Junio C Hamano on 10 March 2016, 19:13:41 UTC
The "v(iew)" subcommand of the interactive "git am -i" command was
broken in 2.6.0 timeframe when the command was rewritten in C.

* jc/am-i-v-fix:
  am -i: fix "v"iew
  pager: factor out a helper to prepare a child process to run the pager
  pager: lose a separate argv[]
2 parent s 9c17cca + 708b8cc
Raw File
t1008-read-tree-overlay.sh
#!/bin/sh

test_description='test multi-tree read-tree without merging'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh

test_expect_success setup '
	echo one >a &&
	git add a &&
	git commit -m initial &&
	git tag initial &&
	echo two >b &&
	git add b &&
	git commit -m second &&
	git checkout -b side initial &&
	echo three >a &&
	mkdir b &&
	echo four >b/c &&
	git add b/c &&
	git commit -m third
'

test_expect_success 'multi-read' '
	read_tree_must_succeed initial master side &&
	(echo a; echo b/c) >expect &&
	git ls-files >actual &&
	test_cmp expect actual
'

test_done

back to top