28bfa145e4
Before this patch, something like: $ git rev-parse --verify HEAD --default master did not work, while: $ git rev-parse --default master --verify HEAD worked. This patch fixes that, so that they both work (assuming HEAD and master can be parsed). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
114 lines
3.4 KiB
Bash
Executable File
114 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Christian Couder
|
|
#
|
|
test_description='test git rev-parse --verify'
|
|
|
|
exec </dev/null
|
|
|
|
. ./test-lib.sh
|
|
|
|
add_line_into_file()
|
|
{
|
|
_line=$1
|
|
_file=$2
|
|
|
|
if [ -f "$_file" ]; then
|
|
echo "$_line" >> $_file || return $?
|
|
MSG="Add <$_line> into <$_file>."
|
|
else
|
|
echo "$_line" > $_file || return $?
|
|
git add $_file || return $?
|
|
MSG="Create file <$_file> with <$_line> inside."
|
|
fi
|
|
|
|
test_tick
|
|
git-commit --quiet -m "$MSG" $_file
|
|
}
|
|
|
|
HASH1=
|
|
HASH2=
|
|
HASH3=
|
|
HASH4=
|
|
|
|
test_expect_success 'set up basic repo with 1 file (hello) and 4 commits' '
|
|
add_line_into_file "1: Hello World" hello &&
|
|
HASH1=$(git rev-parse --verify HEAD) &&
|
|
add_line_into_file "2: A new day for git" hello &&
|
|
HASH2=$(git rev-parse --verify HEAD) &&
|
|
add_line_into_file "3: Another new day for git" hello &&
|
|
HASH3=$(git rev-parse --verify HEAD) &&
|
|
add_line_into_file "4: Ciao for now" hello &&
|
|
HASH4=$(git rev-parse --verify HEAD)
|
|
'
|
|
|
|
test_expect_success 'works with one good rev' '
|
|
rev_hash1=$(git rev-parse --verify $HASH1) &&
|
|
test "$rev_hash1" = "$HASH1" &&
|
|
rev_hash2=$(git rev-parse --verify $HASH2) &&
|
|
test "$rev_hash2" = "$HASH2" &&
|
|
rev_hash3=$(git rev-parse --verify $HASH3) &&
|
|
test "$rev_hash3" = "$HASH3" &&
|
|
rev_hash4=$(git rev-parse --verify $HASH4) &&
|
|
test "$rev_hash4" = "$HASH4" &&
|
|
rev_master=$(git rev-parse --verify master) &&
|
|
test "$rev_master" = "$HASH4" &&
|
|
rev_head=$(git rev-parse --verify HEAD) &&
|
|
test "$rev_head" = "$HASH4"
|
|
'
|
|
|
|
test_expect_success 'fails with any bad rev or many good revs' '
|
|
test_must_fail git rev-parse --verify 2>error &&
|
|
grep "single revision" error &&
|
|
test_must_fail git rev-parse --verify foo 2>error &&
|
|
grep "single revision" error &&
|
|
test_must_fail git rev-parse --verify HEAD bar 2>error &&
|
|
grep "single revision" error &&
|
|
test_must_fail git rev-parse --verify baz HEAD 2>error &&
|
|
grep "single revision" error &&
|
|
test_must_fail git rev-parse --verify $HASH2 HEAD 2>error &&
|
|
grep "single revision" error
|
|
'
|
|
|
|
test_expect_success 'fails silently when using -q' '
|
|
test_must_fail git rev-parse --verify --quiet 2>error &&
|
|
test -z "$(cat error)" &&
|
|
test_must_fail git rev-parse -q --verify foo 2>error &&
|
|
test -z "$(cat error)" &&
|
|
test_must_fail git rev-parse --verify -q HEAD bar 2>error &&
|
|
test -z "$(cat error)" &&
|
|
test_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&
|
|
test -z "$(cat error)" &&
|
|
test_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&
|
|
test -z "$(cat error)"
|
|
'
|
|
|
|
test_expect_success '1 no stdout output on error' '
|
|
test -z "$(git rev-parse --verify)" &&
|
|
test -z "$(git rev-parse --verify foo)" &&
|
|
test -z "$(git rev-parse --verify baz HEAD)"
|
|
'
|
|
|
|
test_expect_failure '2 no stdout output on error' '
|
|
test -z "$(git rev-parse --verify HEAD bar)"
|
|
'
|
|
|
|
test_expect_failure '3 no stdout output on error' '
|
|
test -z "$(git rev-parse --verify $HASH2 HEAD)"
|
|
'
|
|
|
|
test_expect_success 'use --default' '
|
|
git rev-parse --verify --default master &&
|
|
git rev-parse --verify --default master HEAD &&
|
|
git rev-parse --default master --verify &&
|
|
git rev-parse --default master --verify HEAD &&
|
|
git rev-parse --verify HEAD --default master &&
|
|
test_must_fail git rev-parse --verify foo --default master &&
|
|
test_must_fail git rev-parse --default HEAD --verify bar &&
|
|
test_must_fail git rev-parse --verify --default HEAD baz &&
|
|
test_must_fail git rev-parse --default foo --verify &&
|
|
test_must_fail git rev-parse --verify --default bar
|
|
'
|
|
|
|
test_done
|