Skip to main content

Browse the archive

Staging
v0.5.2
Revision a6f47b2be43fbe70236316edc6c87ad9522c485d authored by Miklos Vajna on 22 April 2008, 12:23:48 UTC, committed by Junio C Hamano on 23 April 2008, 04:42:38 UTC 
diff options documentation: refer to --diff-filter in --name-status
 
git diff --name-status outputs letters, but the meaning of those letters
is documented elsewhere. Add a note to make the manpage more intuitive.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9231f50
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' \
    'git diff expected check'

test_done
back to top