t / t6101-rev-parse-parents.shon commit stash: invoke rerere in case of conflict (743bf6d)
   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. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
  10
  11date >path0
  12git update-index --add path0
  13save_tag tree git write-tree
  14hide_error save_tag start unique_commit "start" tree
  15save_tag second unique_commit "second" tree -p start
  16hide_error save_tag start2 unique_commit "start2" tree
  17save_tag two_parents unique_commit "next" tree -p second -p start2
  18save_tag final unique_commit "final" tree -p two_parents
  19
  20test_expect_success 'start is valid' 'git rev-parse start | grep "^[0-9a-f]\{40\}$"'
  21test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git rev-parse start^0)"
  22test_expect_success 'start^1 not valid' "if git rev-parse --verify start^1; then false; else :; fi"
  23test_expect_success 'second^1 = second^' "test $(git rev-parse second^1) = $(git rev-parse second^)"
  24test_expect_success 'final^1^1^1' "test $(git rev-parse start) = $(git rev-parse final^1^1^1)"
  25test_expect_success 'final^1^1^1 = final^^^' "test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)"
  26test_expect_success 'final^1^2' "test $(git rev-parse start2) = $(git rev-parse final^1^2)"
  27test_expect_success 'final^1^2 != final^1^1' "test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)"
  28test_expect_success 'final^1^3 not valid' "if git rev-parse --verify final^1^3; then false; else :; fi"
  29test_expect_success '--verify start2^1' 'test_must_fail git rev-parse --verify start2^1'
  30test_expect_success '--verify start2^0' 'git rev-parse --verify start2^0'
  31test_expect_success 'final^1^@ = final^1^1 final^1^2' "test \"$(git rev-parse final^1^@)\" = \"$(git rev-parse final^1^1 final^1^2)\""
  32test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' "test \"$(git rev-parse final^1^\!)\" = \"$(git rev-parse final^1 ^final^1^1 ^final^1^2)\""
  33
  34test_expect_success 'repack for next test' 'git repack -a -d'
  35test_expect_success 'short SHA-1 works' '
  36        start=`git rev-parse --verify start` &&
  37        echo $start &&
  38        abbrv=`echo $start | sed s/.\$//` &&
  39        echo $abbrv &&
  40        abbrv=`git rev-parse --verify $abbrv` &&
  41        echo $abbrv &&
  42        test $start = $abbrv'
  43
  44test_done