t / t4023-diff-rename-typechange.shon commit Merge branch 'dl/difftool-mergetool' (85ac27e)
   1#!/bin/sh
   2
   3test_description='typechange rename detection'
   4
   5. ./test-lib.sh
   6
   7test_expect_success setup '
   8
   9        rm -f foo bar &&
  10        cat "$TEST_DIRECTORY"/../COPYING >foo &&
  11        test_ln_s_add linklink bar &&
  12        git add foo &&
  13        git commit -a -m Initial &&
  14        git tag one &&
  15
  16        git rm -f foo bar &&
  17        cat "$TEST_DIRECTORY"/../COPYING >bar &&
  18        test_ln_s_add linklink foo &&
  19        git add bar &&
  20        git commit -a -m Second &&
  21        git tag two &&
  22
  23        git rm -f foo bar &&
  24        cat "$TEST_DIRECTORY"/../COPYING >foo &&
  25        git add foo &&
  26        git commit -a -m Third &&
  27        git tag three &&
  28
  29        mv foo bar &&
  30        test_ln_s_add linklink foo &&
  31        git add bar &&
  32        git commit -a -m Fourth &&
  33        git tag four &&
  34
  35        # This is purely for sanity check
  36
  37        git rm -f foo bar &&
  38        cat "$TEST_DIRECTORY"/../COPYING >foo &&
  39        cat "$TEST_DIRECTORY"/../Makefile >bar &&
  40        git add foo bar &&
  41        git commit -a -m Fifth &&
  42        git tag five &&
  43
  44        git rm -f foo bar &&
  45        cat "$TEST_DIRECTORY"/../Makefile >foo &&
  46        cat "$TEST_DIRECTORY"/../COPYING >bar &&
  47        git add foo bar &&
  48        git commit -a -m Sixth &&
  49        git tag six
  50
  51'
  52
  53test_expect_success 'cross renames to be detected for regular files' '
  54
  55        git diff-tree five six -r --name-status -B -M | sort >actual &&
  56        {
  57                echo "R100      foo     bar"
  58                echo "R100      bar     foo"
  59        } | sort >expect &&
  60        test_cmp expect actual
  61
  62'
  63
  64test_expect_success 'cross renames to be detected for typechange' '
  65
  66        git diff-tree one two -r --name-status -B -M | sort >actual &&
  67        {
  68                echo "R100      foo     bar"
  69                echo "R100      bar     foo"
  70        } | sort >expect &&
  71        test_cmp expect actual
  72
  73'
  74
  75test_expect_success 'moves and renames' '
  76
  77        git diff-tree three four -r --name-status -B -M | sort >actual &&
  78        {
  79                # see -B -M (#6) in t4008
  80                echo "C100      foo     bar"
  81                echo "T100      foo"
  82        } | sort >expect &&
  83        test_cmp expect actual
  84
  85'
  86
  87test_done