Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 302bd999fd0ef41f3605a2212c23f54ae43649f8 authored by Junio C Hamano on 16 June 2011, 16:21:36 UTC
Git 1.7.6-rc2
Tip revision: 302bd99
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