Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: f3f778df6900881a7bac409c927931c32b82bcb5 authored by Junio C Hamano on 28 December 2011, 19:49:09 UTC
Git 1.7.8.2
Tip revision: f3f778d
t2015-checkout-unborn.sh
#!/bin/sh

test_description='checkout from unborn branch protects contents'
. ./test-lib.sh

test_expect_success 'setup' '
	mkdir parent &&
	(cd parent &&
	 git init &&
	 echo content >file &&
	 git add file &&
	 git commit -m base
	) &&
	git fetch parent master:origin
'

test_expect_success 'checkout from unborn preserves untracked files' '
	echo precious >expect &&
	echo precious >file &&
	test_must_fail git checkout -b new origin &&
	test_cmp expect file
'

test_expect_success 'checkout from unborn preserves index contents' '
	echo precious >expect &&
	echo precious >file &&
	git add file &&
	test_must_fail git checkout -b new origin &&
	test_cmp expect file &&
	git show :file >file &&
	test_cmp expect file
'

test_expect_success 'checkout from unborn merges identical index contents' '
	echo content >file &&
	git add file &&
	git checkout -b new origin
'

test_done
back to top