t / t4208-log-magic-pathspec.shon commit Merge branch 'master' of https://github.com/vnwildman/git (26a567e)
   1#!/bin/sh
   2
   3test_description='magic pathspec tests using git-log'
   4
   5. ./test-lib.sh
   6
   7test_expect_success 'setup' '
   8        test_commit initial &&
   9        test_tick &&
  10        git commit --allow-empty -m empty &&
  11        mkdir sub
  12'
  13
  14test_expect_success '"git log :/" should not be ambiguous' '
  15        git log :/
  16'
  17
  18test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
  19        : >a &&
  20        test_must_fail git log :/a 2>error &&
  21        test_i18ngrep ambiguous error
  22'
  23
  24test_expect_success '"git log :/a -- " should not be ambiguous' '
  25        git log :/a --
  26'
  27
  28test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
  29        test_when_finished "git checkout master" &&
  30        git checkout --detach &&
  31        # Must manually call `test_tick` instead of using `test_commit`,
  32        # because the latter additionally creates a tag, which would make
  33        # the commit reachable not only via HEAD.
  34        test_tick &&
  35        git commit --allow-empty -m detached &&
  36        test_tick &&
  37        git commit --allow-empty -m something-else &&
  38        git log :/detached --
  39'
  40
  41test_expect_success '"git log :/detached -- " should not find an orphaned commit' '
  42        test_must_fail git log :/detached --
  43'
  44
  45test_expect_success '"git log :/detached -- " should find HEAD only of own worktree' '
  46        git worktree add other-tree HEAD &&
  47        git -C other-tree checkout --detach &&
  48        test_tick &&
  49        git -C other-tree commit --allow-empty -m other-detached &&
  50        git -C other-tree log :/other-detached -- &&
  51        test_must_fail git log :/other-detached --
  52'
  53
  54test_expect_success '"git log -- :/a" should not be ambiguous' '
  55        git log -- :/a
  56'
  57
  58# This differs from the ":/a" check above in that :/in looks like a pathspec,
  59# but doesn't match an actual file.
  60test_expect_success '"git log :/in" should not be ambiguous' '
  61        git log :/in
  62'
  63
  64test_expect_success '"git log :" should be ambiguous' '
  65        test_must_fail git log : 2>error &&
  66        test_i18ngrep ambiguous error
  67'
  68
  69test_expect_success 'git log -- :' '
  70        git log -- :
  71'
  72
  73test_expect_success 'git log HEAD -- :/' '
  74        initial=$(git rev-parse --short HEAD^) &&
  75        cat >expected <<-EOF &&
  76        $initial initial
  77        EOF
  78        (cd sub && git log --oneline HEAD -- :/ >../actual) &&
  79        test_cmp expected actual
  80'
  81
  82test_expect_success '"git log :^sub" is not ambiguous' '
  83        git log :^sub
  84'
  85
  86test_expect_success '"git log :^does-not-exist" does not match anything' '
  87        test_must_fail git log :^does-not-exist
  88'
  89
  90test_expect_success  '"git log :!" behaves the same as :^' '
  91        git log :!sub &&
  92        test_must_fail git log :!does-not-exist
  93'
  94
  95test_expect_success '"git log :(exclude)sub" is not ambiguous' '
  96        git log ":(exclude)sub"
  97'
  98
  99test_expect_success '"git log :(exclude)sub --" must resolve as an object' '
 100        test_must_fail git log ":(exclude)sub" --
 101'
 102
 103test_expect_success '"git log :(unknown-magic) complains of bogus magic' '
 104        test_must_fail git log ":(unknown-magic)" 2>error &&
 105        test_i18ngrep pathspec.magic error
 106'
 107
 108test_expect_success 'command line pathspec parsing for "git log"' '
 109        git reset --hard &&
 110        >a &&
 111        git add a &&
 112        git commit -m "add an empty a" --allow-empty &&
 113        echo 1 >a &&
 114        git commit -a -m "update a to 1" &&
 115        git checkout HEAD^ &&
 116        echo 2 >a &&
 117        git commit -a -m "update a to 2" &&
 118        test_must_fail git merge master &&
 119        git add a &&
 120        git log --merge -- a
 121'
 122
 123test_expect_success 'tree_entry_interesting does not match past submodule boundaries' '
 124        test_when_finished "rm -rf repo submodule" &&
 125        git init submodule &&
 126        test_commit -C submodule initial &&
 127        git init repo &&
 128        >"repo/[bracket]" &&
 129        git -C repo add "[bracket]" &&
 130        test_tick &&
 131        git -C repo commit -m bracket &&
 132        git -C repo rev-list HEAD -- "[bracket]" >expect &&
 133
 134        git -C repo submodule add ../submodule &&
 135        test_tick &&
 136        git -C repo commit -m submodule &&
 137
 138        git -C repo rev-list HEAD -- "[bracket]" >actual &&
 139        test_cmp expect actual
 140'
 141
 142test_done