mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
8d676d85f7
* gv/portable:
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
build: propagate $DIFF to scripts
Makefile: Tru64 portability fix
Makefile: HP-UX 10.20 portability fixes
Makefile: HPUX11 portability fixes
Makefile: SunOS 5.6 portability fix
inline declaration does not work on AIX
Allow disabling "inline"
Some platforms lack socklen_t type
Make NO_{INET_NTOP,INET_PTON} configured independently
Makefile: some platforms do not have hstrerror anywhere
git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
test_cmp: do not use "diff -u" on platforms that lack one
fixup: do not unconditionally disable "diff -u"
tests: use "test_cmp", not "diff", when verifying the result
Do not use "diff" found on PATH while building and installing
enums: omit trailing comma for portability
Makefile: -lpthread may still be necessary when libc has only pthread stubs
Rewrite dynamic structure initializations to runtime assignment
Makefile: pass CPPFLAGS through to fllow customization
Conflicts:
Makefile
wt-status.h
127 lines
2.6 KiB
Bash
127 lines
2.6 KiB
Bash
: included from 6002 and others
|
|
|
|
[ -d .git/refs/tags ] || mkdir -p .git/refs/tags
|
|
|
|
:> sed.script
|
|
|
|
# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags
|
|
tag()
|
|
{
|
|
_tag=$1
|
|
[ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist"
|
|
cat .git/refs/tags/$_tag
|
|
}
|
|
|
|
# Generate a commit using the text specified to make it unique and the tree
|
|
# named by the tag specified.
|
|
unique_commit()
|
|
{
|
|
_text=$1
|
|
_tree=$2
|
|
shift 2
|
|
echo $_text | git commit-tree $(tag $_tree) "$@"
|
|
}
|
|
|
|
# Save the output of a command into the tag specified. Prepend
|
|
# a substitution script for the tag onto the front of sed.script
|
|
save_tag()
|
|
{
|
|
_tag=$1
|
|
[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
|
|
shift 1
|
|
"$@" >.git/refs/tags/$_tag
|
|
|
|
echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
|
|
cat sed.script >> sed.script.tmp
|
|
rm sed.script
|
|
mv sed.script.tmp sed.script
|
|
}
|
|
|
|
# Replace unhelpful sha1 hashses with their symbolic equivalents
|
|
entag()
|
|
{
|
|
sed -f sed.script
|
|
}
|
|
|
|
# Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL
|
|
# tag to a specified value. Restore the original value on return.
|
|
as_author()
|
|
{
|
|
_author=$1
|
|
shift 1
|
|
_save=$GIT_AUTHOR_EMAIL
|
|
|
|
GIT_AUTHOR_EMAIL="$_author"
|
|
export GIT_AUTHOR_EMAIL
|
|
"$@"
|
|
if test -z "$_save"
|
|
then
|
|
unset GIT_AUTHOR_EMAIL
|
|
else
|
|
GIT_AUTHOR_EMAIL="$_save"
|
|
export GIT_AUTHOR_EMAIL
|
|
fi
|
|
}
|
|
|
|
commit_date()
|
|
{
|
|
_commit=$1
|
|
git cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
|
|
}
|
|
|
|
on_committer_date()
|
|
{
|
|
_date=$1
|
|
shift 1
|
|
GIT_COMMITTER_DATE="$_date"
|
|
export GIT_COMMITTER_DATE
|
|
"$@"
|
|
unset GIT_COMMITTER_DATE
|
|
}
|
|
|
|
# Execute a command and suppress any error output.
|
|
hide_error()
|
|
{
|
|
"$@" 2>/dev/null
|
|
}
|
|
|
|
check_output()
|
|
{
|
|
_name=$1
|
|
shift 1
|
|
if eval "$*" | entag > $_name.actual
|
|
then
|
|
test_cmp $_name.expected $_name.actual
|
|
else
|
|
return 1;
|
|
fi
|
|
}
|
|
|
|
# Turn a reasonable test description into a reasonable test name.
|
|
# All alphanums translated into -'s which are then compressed and stripped
|
|
# from front and back.
|
|
name_from_description()
|
|
{
|
|
perl -pe '
|
|
s/[^A-Za-z0-9.]/-/g;
|
|
s/-+/-/g;
|
|
s/-$//;
|
|
s/^-//;
|
|
y/A-Z/a-z/;
|
|
'
|
|
}
|
|
|
|
|
|
# Execute the test described by the first argument, by eval'ing
|
|
# command line specified in the 2nd argument. Check the status code
|
|
# is zero and that the output matches the stream read from
|
|
# stdin.
|
|
test_output_expect_success()
|
|
{
|
|
_description=$1
|
|
_test=$2
|
|
[ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
|
|
_name=$(echo $_description | name_from_description)
|
|
cat > $_name.expected
|
|
test_expect_success "$_description" "check_output $_name \"$_test\""
|
|
}
|