Skip to main content

Browse the archive

Revision 0aa62fd0414b0e8a6271d1d0dd80e5f640633473 authored by Stephen Boyd on 04 May 2009, 06:25:32 UTC, committed by Junio C Hamano on 06 May 2009, 05:05:36 UTC 
completion: add {gui,diff,merge}tool, man, and pager config variables
 
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 226b343
Raw File
t4120-apply-popt.sh 
#!/bin/sh
#
# Copyright (c) 2007 Shawn O. Pearce
#

test_description='git apply -p handling.'

. ./test-lib.sh

test_expect_success setup '
	mkdir sub &&
	echo A >sub/file1 &&
	cp sub/file1 file1 &&
	git add sub/file1 &&
	echo B >sub/file1 &&
	git diff >patch.file &&
	rm sub/file1 &&
	rmdir sub
'

test_expect_success 'apply git diff with -p2' '
	git apply -p2 patch.file
'

test_done
back to top