t / t6101-rev-parse-parents.shon commit Merge branch 'jk/create-branch-remove-unused-param' (6846e87)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Johannes Schindelin
   4#
   5
   6test_description='Test git rev-parse with different parent options'
   7
   8. ./test-lib.sh
   9
  10test_cmp_rev_output () {
  11        git rev-parse --verify "$1" >expect &&
  12        eval "$2" >actual &&
  13        test_cmp expect actual
  14}
  15
  16test_expect_success 'setup' '
  17        test_commit start &&
  18        test_commit second &&
  19        git checkout --orphan tmp &&
  20        test_commit start2 &&
  21        git checkout master &&
  22        git merge -m next --allow-unrelated-histories start2 &&
  23        test_commit final &&
  24
  25        test_seq 40 |
  26        while read i
  27        do
  28                git checkout --orphan "b$i" &&
  29                test_tick &&
  30                git commit --allow-empty -m "$i" &&
  31                commit=$(git rev-parse --verify HEAD) &&
  32                printf "$commit " >>.git/info/grafts
  33        done
  34'
  35
  36test_expect_success 'start is valid' '
  37        git rev-parse start | grep "^[0-9a-f]\{40\}$"
  38'
  39
  40test_expect_success 'start^0' '
  41        test_cmp_rev_output tags/start "git rev-parse start^0"
  42'
  43
  44test_expect_success 'start^1 not valid' '
  45        test_must_fail git rev-parse --verify start^1
  46'
  47
  48test_expect_success 'second^1 = second^' '
  49        test_cmp_rev_output second^ "git rev-parse second^1"
  50'
  51
  52test_expect_success 'final^1^1^1' '
  53        test_cmp_rev_output start "git rev-parse final^1^1^1"
  54'
  55
  56test_expect_success 'final^1^1^1 = final^^^' '
  57        test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
  58'
  59
  60test_expect_success 'final^1^2' '
  61        test_cmp_rev_output start2 "git rev-parse final^1^2"
  62'
  63
  64test_expect_success 'final^1^2 != final^1^1' '
  65        test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
  66'
  67
  68test_expect_success 'final^1^3 not valid' '
  69        test_must_fail git rev-parse --verify final^1^3
  70'
  71
  72test_expect_success '--verify start2^1' '
  73        test_must_fail git rev-parse --verify start2^1
  74'
  75
  76test_expect_success '--verify start2^0' '
  77        git rev-parse --verify start2^0
  78'
  79
  80test_expect_success 'final^1^@ = final^1^1 final^1^2' '
  81        git rev-parse final^1^1 final^1^2 >expect &&
  82        git rev-parse final^1^@ >actual &&
  83        test_cmp expect actual
  84'
  85
  86test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
  87        git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
  88        git rev-parse final^1^! >actual &&
  89        test_cmp expect actual
  90'
  91
  92test_expect_success 'large graft octopus' '
  93        test_cmp_rev_output b31 "git rev-parse --verify b1^30"
  94'
  95
  96test_expect_success 'repack for next test' '
  97        git repack -a -d
  98'
  99
 100test_expect_success 'short SHA-1 works' '
 101        start=$(git rev-parse --verify start) &&
 102        test_cmp_rev_output start "git rev-parse ${start%?}"
 103'
 104
 105# rev^- tests; we can use a simpler setup for these
 106
 107test_expect_success 'setup for rev^- tests' '
 108        test_commit one &&
 109        test_commit two &&
 110        test_commit three &&
 111
 112        # Merge in a branch for testing rev^-
 113        git checkout -b branch &&
 114        git checkout HEAD^^ &&
 115        git merge -m merge --no-edit --no-ff branch &&
 116        git checkout -b merge
 117'
 118
 119# The merged branch has 2 commits + the merge
 120test_expect_success 'rev-list --count merge^- = merge^..merge' '
 121        git rev-list --count merge^..merge >expect &&
 122        echo 3 >actual &&
 123        test_cmp expect actual
 124'
 125
 126# All rev^- rev-parse tests
 127
 128test_expect_success 'rev-parse merge^- = merge^..merge' '
 129        git rev-parse merge^..merge >expect &&
 130        git rev-parse merge^- >actual &&
 131        test_cmp expect actual
 132'
 133
 134test_expect_success 'rev-parse merge^-1 = merge^..merge' '
 135        git rev-parse merge^1..merge >expect &&
 136        git rev-parse merge^-1 >actual &&
 137        test_cmp expect actual
 138'
 139
 140test_expect_success 'rev-parse merge^-2 = merge^2..merge' '
 141        git rev-parse merge^2..merge >expect &&
 142        git rev-parse merge^-2 >actual &&
 143        test_cmp expect actual
 144'
 145
 146test_expect_success 'rev-parse merge^-0 (invalid parent)' '
 147        test_must_fail git rev-parse merge^-0
 148'
 149
 150test_expect_success 'rev-parse merge^-3 (invalid parent)' '
 151        test_must_fail git rev-parse merge^-3
 152'
 153
 154test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
 155        test_must_fail git rev-parse merge^-^
 156'
 157
 158test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
 159        test_must_fail git rev-parse merge^-1x
 160'
 161
 162# All rev^- rev-list tests (should be mostly the same as rev-parse; the reason
 163# for the duplication is that rev-parse and rev-list use different parsers).
 164
 165test_expect_success 'rev-list merge^- = merge^..merge' '
 166        git rev-list merge^..merge >expect &&
 167        git rev-list merge^- >actual &&
 168        test_cmp expect actual
 169'
 170
 171test_expect_success 'rev-list merge^-1 = merge^1..merge' '
 172        git rev-list merge^1..merge >expect &&
 173        git rev-list merge^-1 >actual &&
 174        test_cmp expect actual
 175'
 176
 177test_expect_success 'rev-list merge^-2 = merge^2..merge' '
 178        git rev-list merge^2..merge >expect &&
 179        git rev-list merge^-2 >actual &&
 180        test_cmp expect actual
 181'
 182
 183test_expect_success 'rev-list merge^-0 (invalid parent)' '
 184        test_must_fail git rev-list merge^-0
 185'
 186
 187test_expect_success 'rev-list merge^-3 (invalid parent)' '
 188        test_must_fail git rev-list merge^-3
 189'
 190
 191test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
 192        test_must_fail git rev-list merge^-^
 193'
 194
 195test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
 196        test_must_fail git rev-list merge^-1x
 197'
 198
 199test_done