Skip to main content

Browse the archive

Revision 51a94af845cb3f797abd638478834721d7295af7 authored by Junio C Hamano on 17 October 2008, 06:37:44 UTC, committed by Junio C Hamano on 17 October 2008, 21:35:06 UTC 
Fix "checkout --track -b newbranch" on detached HEAD
 
The test to make sure that checkout fails when --track was asked for and
we cannot set up tracking information in t7201 was wrong, and it turns out
that the implementation for that feature itself was buggy.  This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8ed0a74
Raw File
t4006-diff-mode.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='Test mode change diffs.

'
. ./test-lib.sh

test_expect_success \
    'setup' \
    'echo frotz >rezrov &&
     git update-index --add rezrov &&
     tree=`git write-tree` &&
     echo $tree'

if [ "$(git config --get core.filemode)" = false ]
then
	say 'filemode disabled on the filesystem, using update-index --chmod=+x'
	test_expect_success \
	    'git update-index --chmod=+x' \
	    'git update-index rezrov &&
	     git update-index --chmod=+x rezrov &&
	     git diff-index $tree >current'
else
	test_expect_success \
	    'chmod' \
	    'chmod +x rezrov &&
	     git update-index rezrov &&
	     git diff-index $tree >current'
fi

_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
sed -e 's/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /' <current >check
echo ":100644 100755 X X M	rezrov" >expected

test_expect_success \
    'verify' \
    'test_cmp expected check'

test_done
back to top