t / t4006-diff-mode.shon commit stash: invoke rerere in case of conflict (743bf6d)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Test mode change diffs.
   7
   8'
   9. ./test-lib.sh
  10
  11test_expect_success \
  12    'setup' \
  13    'echo frotz >rezrov &&
  14     git update-index --add rezrov &&
  15     tree=`git write-tree` &&
  16     echo $tree'
  17
  18test_expect_success \
  19    'chmod' \
  20    'test_chmod +x rezrov &&
  21     git diff-index $tree >current'
  22
  23sed -e 's/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /' <current >check
  24echo ":100644 100755 X X M      rezrov" >expected
  25
  26test_expect_success \
  27    'verify' \
  28    'test_cmp expected check'
  29
  30test_done