Andrew's git - gitweb.git/blob - t/t4116-apply-reverse.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='git apply in reverse
   7
   8'
   9
  10. ./test-lib.sh
  11
  12test_expect_success setup '
  13
  14        for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
  15        perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
  16
  17        git add file1 file2 &&
  18        git commit -m initial &&
  19        git tag initial &&
  20
  21        for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
  22        perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
  23
  24        git commit -a -m second &&
  25        git tag second &&
  26
  27        git diff --binary initial second >patch
  28
  29'
  30
  31test_expect_success 'apply in forward' '
  32
  33        T0=$(git rev-parse "second^{tree}") &&
  34        git reset --hard initial &&
  35        git apply --index --binary patch &&
  36        T1=$(git write-tree) &&
  37        test "$T0" = "$T1"
  38'
  39
  40test_expect_success 'apply in reverse' '
  41
  42        git reset --hard second &&
  43        git apply --reverse --binary --index patch &&
  44        git diff >diff &&
  45        test_must_be_empty diff
  46
  47'
  48
  49test_expect_success 'setup separate repository lacking postimage' '
  50
  51        git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
  52        (
  53                cd initial && git init && git add .
  54        ) &&
  55
  56        git archive --format=tar --prefix=second/ second | $TAR xf - &&
  57        (
  58                cd second && git init && git add .
  59        )
  60
  61'
  62
  63test_expect_success 'apply in forward without postimage' '
  64
  65        T0=$(git rev-parse "second^{tree}") &&
  66        (
  67                cd initial &&
  68                git apply --index --binary ../patch &&
  69                T1=$(git write-tree) &&
  70                test "$T0" = "$T1"
  71        )
  72'
  73
  74test_expect_success 'apply in reverse without postimage' '
  75
  76        T0=$(git rev-parse "initial^{tree}") &&
  77        (
  78                cd second &&
  79                git apply --index --binary --reverse ../patch &&
  80                T1=$(git write-tree) &&
  81                test "$T0" = "$T1"
  82        )
  83'
  84
  85test_expect_success 'reversing a whitespace introduction' '
  86        sed "s/a/a /" < file1 > file1.new &&
  87        mv file1.new file1 &&
  88        git diff | git apply --reverse --whitespace=error
  89'
  90
  91test_done