t / t4208-log-magic-pathspec.shon commit wt-status.c: set commitable bit if there is a meaningful merge. (8dc874b)
   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        grep 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 -- :/a" should not be ambiguous' '
  29        git log -- :/a
  30'
  31
  32test_expect_success '"git log :" should be ambiguous' '
  33        test_must_fail git log : 2>error &&
  34        grep ambiguous error
  35'
  36
  37test_expect_success 'git log -- :' '
  38        git log -- :
  39'
  40
  41test_expect_success 'git log HEAD -- :/' '
  42        cat >expected <<-EOF &&
  43        24b24cf initial
  44        EOF
  45        (cd sub && git log --oneline HEAD -- :/ >../actual) &&
  46        test_cmp expected actual
  47'
  48
  49test_expect_success 'command line pathspec parsing for "git log"' '
  50        git reset --hard &&
  51        >a &&
  52        git add a &&
  53        git commit -m "add an empty a" --allow-empty &&
  54        echo 1 >a &&
  55        git commit -a -m "update a to 1" &&
  56        git checkout HEAD^ &&
  57        echo 2 >a &&
  58        git commit -a -m "update a to 2" &&
  59        test_must_fail git merge master &&
  60        git add a &&
  61        git log --merge -- a
  62'
  63
  64test_done