t / t5521-pull-options.shon commit Teach 'git merge' and 'git pull' the option --ff-only (1347483)
   1#!/bin/sh
   2
   3test_description='pull options'
   4
   5. ./test-lib.sh
   6
   7D=`pwd`
   8
   9test_expect_success 'setup' '
  10        mkdir parent &&
  11        (cd parent && git init &&
  12         echo one >file && git add file &&
  13         git commit -m one)
  14'
  15
  16cd "$D"
  17
  18test_expect_success 'git pull -q' '
  19        mkdir clonedq &&
  20        cd clonedq &&
  21        git pull -q "$D/parent" >out 2>err &&
  22        test ! -s out
  23'
  24
  25cd "$D"
  26
  27test_expect_success 'git pull' '
  28        mkdir cloned &&
  29        cd cloned &&
  30        git pull "$D/parent" >out 2>err &&
  31        test -s out
  32'
  33cd "$D"
  34
  35test_expect_success 'git pull -v' '
  36        mkdir clonedv &&
  37        cd clonedv &&
  38        git pull -v "$D/parent" >out 2>err &&
  39        test -s out
  40'
  41
  42cd "$D"
  43
  44test_expect_success 'git pull -v -q' '
  45        mkdir clonedvq &&
  46        cd clonedvq &&
  47        git pull -v -q "$D/parent" >out 2>err &&
  48        test ! -s out
  49'
  50
  51cd "$D"
  52
  53test_expect_success 'git pull -q -v' '
  54        mkdir clonedqv &&
  55        cd clonedqv &&
  56        git pull -q -v "$D/parent" >out 2>err &&
  57        test -s out
  58'
  59
  60test_done