mirror of
https://github.com/git/git.git
synced 2024-11-25 19:04:18 +08:00
2ad23273e7
Some test scripts use the GIT_TRACE mechanism to dump debugging information to descriptor 3 (and point it to a file using the shell). On Windows, however, bash is unable to set up descriptor 3. We do not write our trace to the file, and worse, we may interfere with other operations happening on descriptor 3, causing tests to fail or even behave inconsistently. Prior to commit97a83fa(upload-pack: remove packet debugging harness), these tests used GIT_DEBUG_SEND_PACK, which only supported output to a descriptor. The tests in t5503 were always broken on Windows, and were marked to be skipped via the NOT_MINGW prerequisite. In t5700, the tests used to pass prior to97a83fa, but only because they were not careful enough; because we only grepped the trace file, an empty file looked successful to us. But post-97a83fa, the writing to descriptor 3 causes "git fetch" to hang (presumably because we are throwing random bytes into the middle of the protocol). Now that we are using the GIT_TRACE mechanism, we can improve both scripts by asking git to write directly to a file rather than a descriptor. That fixes the hang in t5700, and should allow t5503 to successfully run on Windows. In both cases we now also use "test -s" to double-check that our trace file actually contains output, which should reduce the possibility of an erroneously passing test. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
189 lines
4.0 KiB
Bash
Executable File
189 lines
4.0 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (C) 2006 Martin Waitz <tali@admingilde.org>
|
|
#
|
|
|
|
test_description='test clone --reference'
|
|
. ./test-lib.sh
|
|
|
|
base_dir=`pwd`
|
|
|
|
U=$base_dir/UPLOAD_LOG
|
|
|
|
test_expect_success 'preparing first repository' \
|
|
'test_create_repo A && cd A &&
|
|
echo first > file1 &&
|
|
git add file1 &&
|
|
git commit -m initial'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'preparing second repository' \
|
|
'git clone A B && cd B &&
|
|
echo second > file2 &&
|
|
git add file2 &&
|
|
git commit -m addition &&
|
|
git repack -a -d &&
|
|
git prune'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'cloning with reference (-l -s)' \
|
|
'git clone -l -s --reference B A C'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'existence of info/alternates' \
|
|
'test_line_count = 2 C/.git/objects/info/alternates'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'pulling from reference' \
|
|
'cd C &&
|
|
git pull ../B master'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'that reference gets used' \
|
|
'cd C &&
|
|
echo "0 objects, 0 kilobytes" > expected &&
|
|
git count-objects > current &&
|
|
test_cmp expected current'
|
|
|
|
cd "$base_dir"
|
|
|
|
rm -f "$U.D"
|
|
|
|
test_expect_success 'cloning with reference (no -l -s)' '
|
|
GIT_TRACE_PACKET=$U.D git clone --reference B "file://$(pwd)/A" D
|
|
'
|
|
|
|
test_expect_success 'fetched no objects' '
|
|
test -s "$U.D" &&
|
|
! grep " want" "$U.D"
|
|
'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'existence of info/alternates' \
|
|
'test_line_count = 1 D/.git/objects/info/alternates'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'pulling from reference' \
|
|
'cd D && git pull ../B master'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'that reference gets used' \
|
|
'cd D && echo "0 objects, 0 kilobytes" > expected &&
|
|
git count-objects > current &&
|
|
test_cmp expected current'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'updating origin' \
|
|
'cd A &&
|
|
echo third > file3 &&
|
|
git add file3 &&
|
|
git commit -m update &&
|
|
git repack -a -d &&
|
|
git prune'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'pulling changes from origin' \
|
|
'cd C &&
|
|
git pull origin'
|
|
|
|
cd "$base_dir"
|
|
|
|
# the 2 local objects are commit and tree from the merge
|
|
test_expect_success 'that alternate to origin gets used' \
|
|
'cd C &&
|
|
echo "2 objects" > expected &&
|
|
git count-objects | cut -d, -f1 > current &&
|
|
test_cmp expected current'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'pulling changes from origin' \
|
|
'cd D &&
|
|
git pull origin'
|
|
|
|
cd "$base_dir"
|
|
|
|
# the 5 local objects are expected; file3 blob, commit in A to add it
|
|
# and its tree, and 2 are our tree and the merge commit.
|
|
test_expect_success 'check objects expected to exist locally' \
|
|
'cd D &&
|
|
echo "5 objects" > expected &&
|
|
git count-objects | cut -d, -f1 > current &&
|
|
test_cmp expected current'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'preparing alternate repository #1' \
|
|
'test_create_repo F && cd F &&
|
|
echo first > file1 &&
|
|
git add file1 &&
|
|
git commit -m initial'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'cloning alternate repo #2 and adding changes to repo #1' \
|
|
'git clone F G && cd F &&
|
|
echo second > file2 &&
|
|
git add file2 &&
|
|
git commit -m addition'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'cloning alternate repo #1, using #2 as reference' \
|
|
'git clone --reference G F H'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'cloning with reference being subset of source (-l -s)' \
|
|
'git clone -l -s --reference A B E'
|
|
|
|
cd "$base_dir"
|
|
|
|
test_expect_success 'clone with reference from a tagged repository' '
|
|
(
|
|
cd A && git tag -a -m 'tagged' HEAD
|
|
) &&
|
|
git clone --reference=A A I
|
|
'
|
|
|
|
test_expect_success 'prepare branched repository' '
|
|
git clone A J &&
|
|
(
|
|
cd J &&
|
|
git checkout -b other master^ &&
|
|
echo other >otherfile &&
|
|
git add otherfile &&
|
|
git commit -m other &&
|
|
git checkout master
|
|
)
|
|
'
|
|
|
|
rm -f "$U.K"
|
|
|
|
test_expect_success 'fetch with incomplete alternates' '
|
|
git init K &&
|
|
echo "$base_dir/A/.git/objects" >K/.git/objects/info/alternates &&
|
|
(
|
|
cd K &&
|
|
git remote add J "file://$base_dir/J" &&
|
|
GIT_TRACE_PACKET=$U.K git fetch J
|
|
) &&
|
|
master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) &&
|
|
test -s "$U.K" &&
|
|
! grep " want $master_object" "$U.K" &&
|
|
tag_object=$(cd A && git for-each-ref --format="%(objectname)" refs/tags/HEAD) &&
|
|
! grep " want $tag_object" "$U.K"
|
|
'
|
|
|
|
test_done
|