t / t4211-line-log.shon commit lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts (5b2d8d6)
   1#!/bin/sh
   2
   3test_description='test log -L'
   4. ./test-lib.sh
   5
   6test_expect_success 'setup (import history)' '
   7        git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
   8        git reset --hard
   9'
  10
  11canned_test_1 () {
  12        test_expect_$1 "$2" "
  13                git log $2 >actual &&
  14                test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual
  15        "
  16}
  17
  18canned_test () {
  19        canned_test_1 success "$@"
  20}
  21canned_test_failure () {
  22        canned_test_1 failure "$@"
  23}
  24
  25test_bad_opts () {
  26        test_expect_success "invalid args: $1" "
  27                test_must_fail git log $1 2>errors &&
  28                grep '$2' errors
  29        "
  30}
  31
  32canned_test "-L 4,12:a.c simple" simple-f
  33canned_test "-L 4,+9:a.c simple" simple-f
  34canned_test "-L '/long f/,/^}/:a.c' simple" simple-f
  35canned_test "-L :f:a.c simple" simple-f-to-main
  36
  37canned_test "-L '/main/,/^}/:a.c' simple" simple-main
  38canned_test "-L :main:a.c simple" simple-main-to-end
  39
  40canned_test "-L 1,+4:a.c simple" beginning-of-file
  41
  42canned_test "-L 20:a.c simple" end-of-file
  43
  44canned_test "-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple" two-ranges
  45canned_test "-L 24,+1:a.c simple" vanishes-early
  46
  47canned_test "-M -L '/long f/,/^}/:b.c' move-support" move-support-f
  48canned_test "-M -L ':f:b.c' parallel-change" parallel-change-f-to-main
  49
  50canned_test "-L 4,12:a.c -L :main:a.c simple" multiple
  51canned_test "-L 4,18:a.c -L ^:main:a.c simple" multiple-overlapping
  52canned_test "-L :main:a.c -L 4,18:a.c simple" multiple-overlapping
  53canned_test "-L 4:a.c -L 8,12:a.c simple" multiple-superset
  54canned_test "-L 8,12:a.c -L 4:a.c simple" multiple-superset
  55
  56test_bad_opts "-L" "switch.*requires a value"
  57test_bad_opts "-L b.c" "argument.*not of the form"
  58test_bad_opts "-L 1:" "argument.*not of the form"
  59test_bad_opts "-L 1:nonexistent" "There is no path"
  60test_bad_opts "-L 1:simple" "There is no path"
  61test_bad_opts "-L '/foo:b.c'" "argument.*not of the form"
  62test_bad_opts "-L 1000:b.c" "has only.*lines"
  63test_bad_opts "-L 1,1000:b.c" "has only.*lines"
  64test_bad_opts "-L :b.c" "argument.*not of the form"
  65test_bad_opts "-L :foo:b.c" "no match"
  66
  67test_expect_success '-L X (X == nlines)' '
  68        n=$(wc -l <b.c) &&
  69        git log -L $n:b.c
  70'
  71
  72test_expect_success '-L X (X == nlines + 1)' '
  73        n=$(expr $(wc -l <b.c) + 1) &&
  74        test_must_fail git log -L $n:b.c
  75'
  76
  77test_expect_success '-L X (X == nlines + 2)' '
  78        n=$(expr $(wc -l <b.c) + 2) &&
  79        test_must_fail git log -L $n:b.c
  80'
  81
  82test_expect_success '-L ,Y (Y == nlines)' '
  83        n=$(printf "%d" $(wc -l <b.c)) &&
  84        git log -L ,$n:b.c
  85'
  86
  87test_expect_success '-L ,Y (Y == nlines + 1)' '
  88        n=$(expr $(wc -l <b.c) + 1) &&
  89        test_must_fail git log -L ,$n:b.c
  90'
  91
  92test_expect_success '-L ,Y (Y == nlines + 2)' '
  93        n=$(expr $(wc -l <b.c) + 2) &&
  94        test_must_fail git log -L ,$n:b.c
  95'
  96
  97test_expect_success '-L with --first-parent and a merge' '
  98        git checkout parallel-change &&
  99        git log --first-parent -L 1,1:b.c
 100'
 101
 102test_done