t / t5520-pull.shon commit filter-branch: introduce convenience function "skip_commit" (f95eef1)
   1#!/bin/sh
   2
   3test_description='pulling into void'
   4
   5. ./test-lib.sh
   6
   7D=`pwd`
   8
   9test_expect_success setup '
  10
  11        echo file >file &&
  12        git add file &&
  13        git commit -a -m original
  14
  15'
  16
  17test_expect_success 'pulling into void' '
  18        mkdir cloned &&
  19        cd cloned &&
  20        git init &&
  21        git pull ..
  22'
  23
  24cd "$D"
  25
  26test_expect_success 'checking the results' '
  27        test -f file &&
  28        test -f cloned/file &&
  29        diff file cloned/file
  30'
  31
  32test_expect_success 'test . as a remote' '
  33
  34        git branch copy master &&
  35        git config branch.copy.remote . &&
  36        git config branch.copy.merge refs/heads/master &&
  37        echo updated >file &&
  38        git commit -a -m updated &&
  39        git checkout copy &&
  40        test `cat file` = file &&
  41        git pull &&
  42        test `cat file` = updated
  43'
  44
  45test_expect_success 'the default remote . should not break explicit pull' '
  46        git checkout -b second master^ &&
  47        echo modified >file &&
  48        git commit -a -m modified &&
  49        git checkout copy &&
  50        git reset --hard HEAD^ &&
  51        test `cat file` = file &&
  52        git pull . second &&
  53        test `cat file` = modified
  54'
  55
  56test_done