t / t7103-reset-bare.shon commit t7610-mergetool: use test_cmp instead of test $(cat file) = $txt (e10dffd)
   1#!/bin/sh
   2
   3test_description='git reset in a bare repository'
   4. ./test-lib.sh
   5
   6test_expect_success 'setup non-bare' '
   7        echo one >file &&
   8        git add file &&
   9        git commit -m one &&
  10        echo two >file &&
  11        git commit -a -m two
  12'
  13
  14test_expect_success '"hard" reset requires a worktree' '
  15        (cd .git &&
  16         test_must_fail git reset --hard)
  17'
  18
  19test_expect_success '"merge" reset requires a worktree' '
  20        (cd .git &&
  21         test_must_fail git reset --merge)
  22'
  23
  24test_expect_success '"keep" reset requires a worktree' '
  25        (cd .git &&
  26         test_must_fail git reset --keep)
  27'
  28
  29test_expect_success '"mixed" reset is ok' '
  30        (cd .git && git reset)
  31'
  32
  33test_expect_success '"soft" reset is ok' '
  34        (cd .git && git reset --soft)
  35'
  36
  37test_expect_success 'hard reset works with GIT_WORK_TREE' '
  38        mkdir worktree &&
  39        GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
  40        test_cmp file worktree/file
  41'
  42
  43test_expect_success 'setup bare' '
  44        git clone --bare . bare.git &&
  45        cd bare.git
  46'
  47
  48test_expect_success '"hard" reset is not allowed in bare' '
  49        test_must_fail git reset --hard HEAD^
  50'
  51
  52test_expect_success '"merge" reset is not allowed in bare' '
  53        test_must_fail git reset --merge HEAD^
  54'
  55
  56test_expect_success '"keep" reset is not allowed in bare' '
  57        test_must_fail git reset --keep HEAD^
  58'
  59
  60test_expect_success '"mixed" reset is not allowed in bare' '
  61        test_must_fail git reset --mixed HEAD^
  62'
  63
  64test_expect_success '"soft" reset is allowed in bare' '
  65        git reset --soft HEAD^ &&
  66        test "$(git show --pretty=format:%s | head -n 1)" = "one"
  67'
  68
  69test_done