diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 19:56:07 +0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 19:56:07 +0400 |
commit | 276328ffb87cefdc515bee5f09916aea6e0244ed (patch) | |
tree | 162b276adac033e8a41266071e046f0f4cf4cd6d /t/t4012-diff-binary.sh | |
parent | 048f2762007d022defceb6850a44bc1bd5ccebf7 (diff) | |
parent | e261cf94848d31868c21fb11cade51c30dfcdbe7 (diff) |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
Teach rebase -i to honor pre-rebase hook
docs: describe pre-rebase hook
do not segfault if make_cache_entry failed
make prefix_path() never return NULL
fix bogus "diff --git" header from "diff --no-index"
Fix fetch/clone --quiet when stdout is connected
builtin-blame: Fix blame -C -C with submodules.
bash: remove fetch, push, pull dashed form leftovers
Conflicts:
diff.c
Diffstat (limited to 't/t4012-diff-binary.sh')
-rwxr-xr-x | t/t4012-diff-binary.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index b8ec6e90af..421f4bba3f 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -77,4 +77,25 @@ test_expect_success 'apply binary patch' \ tree1=`git write-tree` && test "$tree1" = "$tree0"' +q_to_nul() { + perl -pe 'y/Q/\000/' +} + +nul_to_q() { + perl -pe 'y/\000/Q/' +} + +test_expect_success 'diff --no-index with binary creation' ' + echo Q | q_to_nul >binary && + (:# hide error code from diff, which just indicates differences + git diff --binary --no-index /dev/null binary >current || + true + ) && + rm binary && + git apply --binary <current && + echo Q >expected && + nul_to_q <binary >actual && + test_cmp expected actual +' + test_done |