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
t5405-send-pack-rewind.sh
#!/bin/sh

test_description='forced push to replace commit we do not have'

. ./test-lib.sh

test_expect_success setup '

	>file1 && git add file1 && test_tick &&
	git commit -m Initial &&
	git config receive.denyCurrentBranch warn &&

	mkdir another && (
		cd another &&
		git init &&
		git fetch --update-head-ok .. master:master
	) &&

	>file2 && git add file2 && test_tick &&
	git commit -m Second

'

test_expect_success 'non forced push should die not segfault' '

	(
		cd another &&
		git push .. master:master
		test $? = 1
	)

'

test_expect_success 'forced push should succeed' '

	(
		cd another &&
		git push .. +master:master
	)

'

test_done
back to top