t / t4000-diff-format.shon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Test built-in diff output engine.
   7
   8'
   9. ./test-lib.sh
  10. "$TEST_DIRECTORY"/diff-lib.sh
  11
  12echo >path0 'Line 1
  13Line 2
  14line 3'
  15cat path0 >path1
  16chmod +x path1
  17
  18test_expect_success \
  19    'update-index --add two files with and without +x.' \
  20    'git update-index --add path0 path1'
  21
  22mv path0 path0-
  23sed -e 's/line/Line/' <path0- >path0
  24chmod +x path0
  25rm -f path1
  26test_expect_success \
  27    'git diff-files -p after editing work tree.' \
  28    'git diff-files -p >current'
  29
  30# that's as far as it comes
  31if [ "$(git config --get core.filemode)" = false ]
  32then
  33        say 'filemode disabled on the filesystem'
  34        test_done
  35fi
  36
  37cat >expected <<\EOF
  38diff --git a/path0 b/path0
  39old mode 100644
  40new mode 100755
  41--- a/path0
  42+++ b/path0
  43@@ -1,3 +1,3 @@
  44 Line 1
  45 Line 2
  46-line 3
  47+Line 3
  48diff --git a/path1 b/path1
  49deleted file mode 100755
  50--- a/path1
  51+++ /dev/null
  52@@ -1,3 +0,0 @@
  53-Line 1
  54-Line 2
  55-line 3
  56EOF
  57
  58test_expect_success \
  59    'validate git diff-files -p output.' \
  60    'compare_diff_patch current expected'
  61
  62test_done