#!/bin/sh # # Copyright (c) 2005 Johannes Schindelin # global test_description := ''Test git rev-parse with different parent options'' source ./test-lib.sh proc test_cmp_rev_output { git rev-parse --verify $1 >expect && eval $2 >actual && test_cmp expect actual } test_expect_success 'setup' ' test_commit start && test_commit second && git checkout --orphan tmp && test_commit start2 && git checkout master && git merge -m next --allow-unrelated-histories start2 && test_commit final && test_seq 40 | while read i do git checkout --orphan "b$i" && test_tick && git commit --allow-empty -m "$i" && commit=$(git rev-parse --verify HEAD) && printf "$commit " >>.git/info/grafts done ' test_expect_success 'start is valid' ' git rev-parse start | grep "^[0-9a-f]\{40\}$" ' test_expect_success 'start^0' ' test_cmp_rev_output tags/start "git rev-parse start^0" ' test_expect_success 'start^1 not valid' ' test_must_fail git rev-parse --verify start^1 ' test_expect_success 'second^1 = second^' ' test_cmp_rev_output second^ "git rev-parse second^1" ' test_expect_success 'final^1^1^1' ' test_cmp_rev_output start "git rev-parse final^1^1^1" ' test_expect_success 'final^1^1^1 = final^^^' ' test_cmp_rev_output final^^^ "git rev-parse final^1^1^1" ' test_expect_success 'final^1^2' ' test_cmp_rev_output start2 "git rev-parse final^1^2" ' test_expect_success 'final^1^2 != final^1^1' ' test $(git rev-parse final^1^2) != $(git rev-parse final^1^1) ' test_expect_success 'final^1^3 not valid' ' test_must_fail git rev-parse --verify final^1^3 ' test_expect_success '--verify start2^1' ' test_must_fail git rev-parse --verify start2^1 ' test_expect_success '--verify start2^0' ' git rev-parse --verify start2^0 ' test_expect_success 'final^1^@ = final^1^1 final^1^2' ' git rev-parse final^1^1 final^1^2 >expect && git rev-parse final^1^@ >actual && test_cmp expect actual ' test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' ' git rev-parse final^1 ^final^1^1 ^final^1^2 >expect && git rev-parse final^1^! >actual && test_cmp expect actual ' test_expect_success 'large graft octopus' ' test_cmp_rev_output b31 "git rev-parse --verify b1^30" ' test_expect_success 'repack for next test' ' git repack -a -d ' test_expect_success 'short SHA-1 works' ' start=$(git rev-parse --verify start) && test_cmp_rev_output start "git rev-parse ${start%?}" ' # rev^- tests; we can use a simpler setup for these test_expect_success 'setup for rev^- tests' ' test_commit one && test_commit two && test_commit three && # Merge in a branch for testing rev^- git checkout -b branch && git checkout HEAD^^ && git merge -m merge --no-edit --no-ff branch && git checkout -b merge ' # The merged branch has 2 commits + the merge test_expect_success 'rev-list --count merge^- = merge^..merge' ' git rev-list --count merge^..merge >expect && echo 3 >actual && test_cmp expect actual ' # All rev^- rev-parse tests test_expect_success 'rev-parse merge^- = merge^..merge' ' git rev-parse merge^..merge >expect && git rev-parse merge^- >actual && test_cmp expect actual ' test_expect_success 'rev-parse merge^-1 = merge^..merge' ' git rev-parse merge^1..merge >expect && git rev-parse merge^-1 >actual && test_cmp expect actual ' test_expect_success 'rev-parse merge^-2 = merge^2..merge' ' git rev-parse merge^2..merge >expect && git rev-parse merge^-2 >actual && test_cmp expect actual ' test_expect_success 'rev-parse merge^-0 (invalid parent)' ' test_must_fail git rev-parse merge^-0 ' test_expect_success 'rev-parse merge^-3 (invalid parent)' ' test_must_fail git rev-parse merge^-3 ' test_expect_success 'rev-parse merge^-^ (garbage after ^-)' ' test_must_fail git rev-parse merge^-^ ' test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' ' test_must_fail git rev-parse merge^-1x ' # All rev^- rev-list tests (should be mostly the same as rev-parse; the reason # for the duplication is that rev-parse and rev-list use different parsers). test_expect_success 'rev-list merge^- = merge^..merge' ' git rev-list merge^..merge >expect && git rev-list merge^- >actual && test_cmp expect actual ' test_expect_success 'rev-list merge^-1 = merge^1..merge' ' git rev-list merge^1..merge >expect && git rev-list merge^-1 >actual && test_cmp expect actual ' test_expect_success 'rev-list merge^-2 = merge^2..merge' ' git rev-list merge^2..merge >expect && git rev-list merge^-2 >actual && test_cmp expect actual ' test_expect_success 'rev-list merge^-0 (invalid parent)' ' test_must_fail git rev-list merge^-0 ' test_expect_success 'rev-list merge^-3 (invalid parent)' ' test_must_fail git rev-list merge^-3 ' test_expect_success 'rev-list merge^-^ (garbage after ^-)' ' test_must_fail git rev-list merge^-^ ' test_expect_success 'rev-list merge^-1x (garbage after ^-1)' ' test_must_fail git rev-list merge^-1x ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"Test git rev-parse with different parent options">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (FuncDef name: test_cmp_rev_output body: (BraceGroup children: [ (AndOr children: [ (SimpleCommand words: [{(git)} {(rev-parse)} {(--verify)} {(DQ ($ VSub_Number "$1"))}] redirects: [(Redir op_id:Redir_Great fd:-1 arg_word:{(expect)} spids:[42])] ) (AndOr children: [ (SimpleCommand words: [{(eval)} {(DQ ($ VSub_Number "$2"))}] redirects: [(Redir op_id:Redir_Great fd:-1 arg_word:{(actual)} spids:[54])] ) (C {(test_cmp)} {(expect)} {(actual)}) ] op_id: Op_DAmp ) ] op_id: Op_DAmp ) ] spids: [29] ) spids: [24 28] ) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\ttest_commit start &&\n"> <"\ttest_commit second &&\n"> <"\tgit checkout --orphan tmp &&\n"> <"\ttest_commit start2 &&\n"> <"\tgit checkout master &&\n"> <"\tgit merge -m next --allow-unrelated-histories start2 &&\n"> <"\ttest_commit final &&\n"> <"\n"> <"\ttest_seq 40 |\n"> <"\twhile read i\n"> <"\tdo\n"> <"\t\tgit checkout --orphan \"b$i\" &&\n"> <"\t\ttest_tick &&\n"> <"\t\tgit commit --allow-empty -m \"$i\" &&\n"> <"\t\tcommit=$(git rev-parse --verify HEAD) &&\n"> <"\t\tprintf \"$commit \" >>.git/info/grafts\n"> <"\tdone\n"> ) } ) (C {(test_expect_success)} {(SQ <"start is valid">)} {(SQ <"\n"> <"\tgit rev-parse start | grep \"^[0-9a-f]\\{40\\}$\"\n">)} ) (C {(test_expect_success)} {(SQ <"start^0">)} {(SQ <"\n"> <"\ttest_cmp_rev_output tags/start \"git rev-parse start^0\"\n">)} ) (C {(test_expect_success)} {(SQ <"start^1 not valid">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse --verify start^1\n">)} ) (C {(test_expect_success)} {(SQ <"second^1 = second^">)} {(SQ <"\n"> <"\ttest_cmp_rev_output second^ \"git rev-parse second^1\"\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^1^1">)} {(SQ <"\n"> <"\ttest_cmp_rev_output start \"git rev-parse final^1^1^1\"\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^1^1 = final^^^">)} {(SQ <"\n"> <"\ttest_cmp_rev_output final^^^ \"git rev-parse final^1^1^1\"\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^2">)} {(SQ <"\n"> <"\ttest_cmp_rev_output start2 \"git rev-parse final^1^2\"\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^2 != final^1^1">)} {(SQ <"\n"> <"\ttest $(git rev-parse final^1^2) != $(git rev-parse final^1^1)\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^3 not valid">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse --verify final^1^3\n">)} ) (C {(test_expect_success)} {(SQ <"--verify start2^1">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse --verify start2^1\n">)} ) (C {(test_expect_success)} {(SQ <"--verify start2^0">)} {(SQ <"\n"> <"\tgit rev-parse --verify start2^0\n">)} ) (C {(test_expect_success)} {(SQ <"final^1^@ = final^1^1 final^1^2">)} { (SQ <"\n"> <"\tgit rev-parse final^1^1 final^1^2 >expect &&\n"> <"\tgit rev-parse final^1^@ >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"final^1^! = final^1 ^final^1^1 ^final^1^2">)} { (SQ <"\n"> <"\tgit rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&\n"> <"\tgit rev-parse final^1^! >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"large graft octopus">)} {(SQ <"\n"> <"\ttest_cmp_rev_output b31 \"git rev-parse --verify b1^30\"\n">)} ) (C {(test_expect_success)} {(SQ <"repack for next test">)} {(SQ <"\n"> <"\tgit repack -a -d\n">)}) (C {(test_expect_success)} {(SQ <"short SHA-1 works">)} { (SQ <"\n"> <"\tstart=$(git rev-parse --verify start) &&\n"> <"\ttest_cmp_rev_output start \"git rev-parse ${start%?}\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup for rev^- tests">)} { (SQ <"\n"> <"\ttest_commit one &&\n"> <"\ttest_commit two &&\n"> <"\ttest_commit three &&\n"> <"\n"> <"\t# Merge in a branch for testing rev^-\n"> <"\tgit checkout -b branch &&\n"> <"\tgit checkout HEAD^^ &&\n"> <"\tgit merge -m merge --no-edit --no-ff branch &&\n"> <"\tgit checkout -b merge\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-list --count merge^- = merge^..merge">)} { (SQ <"\n"> <"\tgit rev-list --count merge^..merge >expect &&\n"> <"\techo 3 >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-parse merge^- = merge^..merge">)} { (SQ <"\n"> <"\tgit rev-parse merge^..merge >expect &&\n"> <"\tgit rev-parse merge^- >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-1 = merge^..merge">)} { (SQ <"\n"> <"\tgit rev-parse merge^1..merge >expect &&\n"> <"\tgit rev-parse merge^-1 >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-2 = merge^2..merge">)} { (SQ <"\n"> <"\tgit rev-parse merge^2..merge >expect &&\n"> <"\tgit rev-parse merge^-2 >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-0 (invalid parent)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse merge^-0\n">)} ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-3 (invalid parent)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse merge^-3\n">)} ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-^ (garbage after ^-)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse merge^-^\n">)} ) (C {(test_expect_success)} {(SQ <"rev-parse merge^-1x (garbage after ^-1)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-parse merge^-1x\n">)} ) (C {(test_expect_success)} {(SQ <"rev-list merge^- = merge^..merge">)} { (SQ <"\n"> <"\tgit rev-list merge^..merge >expect &&\n"> <"\tgit rev-list merge^- >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-list merge^-1 = merge^1..merge">)} { (SQ <"\n"> <"\tgit rev-list merge^1..merge >expect &&\n"> <"\tgit rev-list merge^-1 >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-list merge^-2 = merge^2..merge">)} { (SQ <"\n"> <"\tgit rev-list merge^2..merge >expect &&\n"> <"\tgit rev-list merge^-2 >actual &&\n"> <"\ttest_cmp expect actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"rev-list merge^-0 (invalid parent)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-list merge^-0\n">)} ) (C {(test_expect_success)} {(SQ <"rev-list merge^-3 (invalid parent)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-list merge^-3\n">)} ) (C {(test_expect_success)} {(SQ <"rev-list merge^-^ (garbage after ^-)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-list merge^-^\n">)} ) (C {(test_expect_success)} {(SQ <"rev-list merge^-1x (garbage after ^-1)">)} {(SQ <"\n"> <"\ttest_must_fail git rev-list merge^-1x\n">)} ) (C {(test_done)}) ] )