Andrew's git / gitweb.git / t/t4133-apply-filenames.sh
?
t / t4133-apply-filenames.shon commit Fix git rebase --continue to work with touched files (25e9325)
   1#!/bin/sh
   2#
   3# Copyright (c) 2010 Andreas Gruenbacher
   4#
   5
   6test_description='git apply filename consistency check'
   7
   8. ./test-lib.sh
   9
  10test_expect_success setup '
  11        cat > bad1.patch <<EOF
  12diff --git a/f b/f
  13new file mode 100644
  14index 0000000..d00491f
  15--- /dev/null
  16+++ b/f-blah
  17@@ -0,0 +1 @@
  18+1
  19EOF
  20        cat > bad2.patch <<EOF
  21diff --git a/f b/f
  22deleted file mode 100644
  23index d00491f..0000000
  24--- b/f-blah
  25+++ /dev/null
  26@@ -1 +0,0 @@
  27-1
  28EOF
  29'
  30
  31test_expect_success 'apply diff with inconsistent filenames in headers' '
  32        test_must_fail git apply bad1.patch 2>err
  33        grep "inconsistent new filename" err
  34        test_must_fail git apply bad2.patch 2>err
  35        grep "inconsistent old filename" err
  36'
  37
  38test_done