t / t5305-include-tag.shon commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1#!/bin/sh
   2
   3test_description='git pack-object --include-tag'
   4. ./test-lib.sh
   5
   6TRASH=`pwd`
   7
   8test_expect_success setup '
   9        echo c >d &&
  10        git update-index --add d &&
  11        tree=`git write-tree` &&
  12        commit=`git commit-tree $tree </dev/null` &&
  13        echo "object $commit" >sig &&
  14        echo "type commit" >>sig &&
  15        echo "tag mytag" >>sig &&
  16        echo "tagger $(git var GIT_COMMITTER_IDENT)" >>sig &&
  17        echo >>sig &&
  18        echo "our test tag" >>sig &&
  19        tag=`git mktag <sig` &&
  20        rm d sig &&
  21        git update-ref refs/tags/mytag $tag && {
  22                echo $tree &&
  23                echo $commit &&
  24                git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)        .*/\\1/"
  25        } >obj-list
  26'
  27
  28rm -rf clone.git
  29test_expect_success 'pack without --include-tag' '
  30        packname_1=$(git pack-objects \
  31                --window=0 \
  32                test-1 <obj-list)
  33'
  34
  35test_expect_success 'unpack objects' '
  36        (
  37                GIT_DIR=clone.git &&
  38                export GIT_DIR &&
  39                git init &&
  40                git unpack-objects -n <test-1-${packname_1}.pack &&
  41                git unpack-objects <test-1-${packname_1}.pack
  42        )
  43'
  44
  45test_expect_success 'check unpacked result (have commit, no tag)' '
  46        git rev-list --objects $commit >list.expect &&
  47        (
  48                GIT_DIR=clone.git &&
  49                export GIT_DIR &&
  50                test_must_fail git cat-file -e $tag &&
  51                git rev-list --objects $commit
  52        ) >list.actual &&
  53        test_cmp list.expect list.actual
  54'
  55
  56rm -rf clone.git
  57test_expect_success 'pack with --include-tag' '
  58        packname_1=$(git pack-objects \
  59                --window=0 \
  60                --include-tag \
  61                test-2 <obj-list)
  62'
  63
  64test_expect_success 'unpack objects' '
  65        (
  66                GIT_DIR=clone.git &&
  67                export GIT_DIR &&
  68                git init &&
  69                git unpack-objects -n <test-2-${packname_1}.pack &&
  70                git unpack-objects <test-2-${packname_1}.pack
  71        )
  72'
  73
  74test_expect_success 'check unpacked result (have commit, have tag)' '
  75        git rev-list --objects mytag >list.expect &&
  76        (
  77                GIT_DIR=clone.git &&
  78                export GIT_DIR &&
  79                git rev-list --objects $tag
  80        ) >list.actual &&
  81        test_cmp list.expect list.actual
  82'
  83
  84test_done