t / t5531-deep-submodule-push.shon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1#!/bin/sh
   2
   3test_description='unpack-objects'
   4
   5. ./test-lib.sh
   6
   7test_expect_success setup '
   8        mkdir pub.git &&
   9        GIT_DIR=pub.git git init --bare
  10        GIT_DIR=pub.git git config receive.fsckobjects true &&
  11        mkdir work &&
  12        (
  13                cd work &&
  14                git init &&
  15                mkdir -p gar/bage &&
  16                (
  17                        cd gar/bage &&
  18                        git init &&
  19                        >junk &&
  20                        git add junk &&
  21                        git commit -m "Initial junk"
  22                ) &&
  23                git add gar/bage &&
  24                git commit -m "Initial superproject"
  25        )
  26'
  27
  28test_expect_success push '
  29        (
  30                cd work &&
  31                git push ../pub.git master
  32        )
  33'
  34
  35test_done