* Updated vendor code for code.gitea.io/git * Display symlinks correctly for files and directories * Added symlink tests * Applied silverwinds stylesheet patch Signed-off-by: Tris Forster <tris.git@shoddynet.org>master
@@ -0,0 +1 @@ | |||||
ref: refs/heads/master |
@@ -0,0 +1,4 @@ | |||||
[core] | |||||
repositoryformatversion = 0 | |||||
filemode = true | |||||
bare = true |
@@ -0,0 +1 @@ | |||||
Unnamed repository; edit this file 'description' to name the repository. |
@@ -0,0 +1,15 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to check the commit log message taken by | |||||
# applypatch from an e-mail message. | |||||
# | |||||
# The hook should exit with non-zero status after issuing an | |||||
# appropriate message if it wants to stop the commit. The hook is | |||||
# allowed to edit the commit message file. | |||||
# | |||||
# To enable this hook, rename this file to "applypatch-msg". | |||||
. git-sh-setup | |||||
commitmsg="$(git rev-parse --git-path hooks/commit-msg)" | |||||
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} | |||||
: |
@@ -0,0 +1,24 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to check the commit log message. | |||||
# Called by "git commit" with one argument, the name of the file | |||||
# that has the commit message. The hook should exit with non-zero | |||||
# status after issuing an appropriate message if it wants to stop the | |||||
# commit. The hook is allowed to edit the commit message file. | |||||
# | |||||
# To enable this hook, rename this file to "commit-msg". | |||||
# Uncomment the below to add a Signed-off-by line to the message. | |||||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg | |||||
# hook is more suited to it. | |||||
# | |||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') | |||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" | |||||
# This example catches duplicate Signed-off-by lines. | |||||
test "" = "$(grep '^Signed-off-by: ' "$1" | | |||||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { | |||||
echo >&2 Duplicate Signed-off-by lines. | |||||
exit 1 | |||||
} |
@@ -0,0 +1,114 @@ | |||||
#!/usr/bin/perl | |||||
use strict; | |||||
use warnings; | |||||
use IPC::Open2; | |||||
# An example hook script to integrate Watchman | |||||
# (https://facebook.github.io/watchman/) with git to speed up detecting | |||||
# new and modified files. | |||||
# | |||||
# The hook is passed a version (currently 1) and a time in nanoseconds | |||||
# formatted as a string and outputs to stdout all files that have been | |||||
# modified since the given time. Paths must be relative to the root of | |||||
# the working tree and separated by a single NUL. | |||||
# | |||||
# To enable this hook, rename this file to "query-watchman" and set | |||||
# 'git config core.fsmonitor .git/hooks/query-watchman' | |||||
# | |||||
my ($version, $time) = @ARGV; | |||||
# Check the hook interface version | |||||
if ($version == 1) { | |||||
# convert nanoseconds to seconds | |||||
$time = int $time / 1000000000; | |||||
} else { | |||||
die "Unsupported query-fsmonitor hook version '$version'.\n" . | |||||
"Falling back to scanning...\n"; | |||||
} | |||||
my $git_work_tree; | |||||
if ($^O =~ 'msys' || $^O =~ 'cygwin') { | |||||
$git_work_tree = Win32::GetCwd(); | |||||
$git_work_tree =~ tr/\\/\//; | |||||
} else { | |||||
require Cwd; | |||||
$git_work_tree = Cwd::cwd(); | |||||
} | |||||
my $retry = 1; | |||||
launch_watchman(); | |||||
sub launch_watchman { | |||||
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') | |||||
or die "open2() failed: $!\n" . | |||||
"Falling back to scanning...\n"; | |||||
# In the query expression below we're asking for names of files that | |||||
# changed since $time but were not transient (ie created after | |||||
# $time but no longer exist). | |||||
# | |||||
# To accomplish this, we're using the "since" generator to use the | |||||
# recency index to select candidate nodes and "fields" to limit the | |||||
# output to file names only. Then we're using the "expression" term to | |||||
# further constrain the results. | |||||
# | |||||
# The category of transient files that we want to ignore will have a | |||||
# creation clock (cclock) newer than $time_t value and will also not | |||||
# currently exist. | |||||
my $query = <<" END"; | |||||
["query", "$git_work_tree", { | |||||
"since": $time, | |||||
"fields": ["name"], | |||||
"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] | |||||
}] | |||||
END | |||||
print CHLD_IN $query; | |||||
close CHLD_IN; | |||||
my $response = do {local $/; <CHLD_OUT>}; | |||||
die "Watchman: command returned no output.\n" . | |||||
"Falling back to scanning...\n" if $response eq ""; | |||||
die "Watchman: command returned invalid output: $response\n" . | |||||
"Falling back to scanning...\n" unless $response =~ /^\{/; | |||||
my $json_pkg; | |||||
eval { | |||||
require JSON::XS; | |||||
$json_pkg = "JSON::XS"; | |||||
1; | |||||
} or do { | |||||
require JSON::PP; | |||||
$json_pkg = "JSON::PP"; | |||||
}; | |||||
my $o = $json_pkg->new->utf8->decode($response); | |||||
if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { | |||||
print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; | |||||
$retry--; | |||||
qx/watchman watch "$git_work_tree"/; | |||||
die "Failed to make watchman watch '$git_work_tree'.\n" . | |||||
"Falling back to scanning...\n" if $? != 0; | |||||
# Watchman will always return all files on the first query so | |||||
# return the fast "everything is dirty" flag to git and do the | |||||
# Watchman query just to get it over with now so we won't pay | |||||
# the cost in git to look up each individual file. | |||||
print "/\0"; | |||||
eval { launch_watchman() }; | |||||
exit 0; | |||||
} | |||||
die "Watchman: $o->{error}.\n" . | |||||
"Falling back to scanning...\n" if $o->{error}; | |||||
binmode STDOUT, ":utf8"; | |||||
local $, = "\0"; | |||||
print @{$o->{files}}; | |||||
} |
@@ -0,0 +1,15 @@ | |||||
#!/usr/bin/env bash | |||||
data=$(cat) | |||||
exitcodes="" | |||||
hookname=$(basename $0) | |||||
GIT_DIR=${GIT_DIR:-$(dirname $0)} | |||||
for hook in ${GIT_DIR}/hooks/${hookname}.d/*; do | |||||
test -x "${hook}" || continue | |||||
echo "${data}" | "${hook}" | |||||
exitcodes="${exitcodes} $?" | |||||
done | |||||
for i in ${exitcodes}; do | |||||
[ ${i} -eq 0 ] || exit ${i} | |||||
done |
@@ -0,0 +1,2 @@ | |||||
#!/usr/bin/env bash | |||||
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' post-receive |
@@ -0,0 +1,8 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to prepare a packed repository for use over | |||||
# dumb transports. | |||||
# | |||||
# To enable this hook, rename this file to "post-update". | |||||
exec git update-server-info |
@@ -0,0 +1,14 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to verify what is about to be committed | |||||
# by applypatch from an e-mail message. | |||||
# | |||||
# The hook should exit with non-zero status after issuing an | |||||
# appropriate message if it wants to stop the commit. | |||||
# | |||||
# To enable this hook, rename this file to "pre-applypatch". | |||||
. git-sh-setup | |||||
precommit="$(git rev-parse --git-path hooks/pre-commit)" | |||||
test -x "$precommit" && exec "$precommit" ${1+"$@"} | |||||
: |
@@ -0,0 +1,49 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to verify what is about to be committed. | |||||
# Called by "git commit" with no arguments. The hook should | |||||
# exit with non-zero status after issuing an appropriate message if | |||||
# it wants to stop the commit. | |||||
# | |||||
# To enable this hook, rename this file to "pre-commit". | |||||
if git rev-parse --verify HEAD >/dev/null 2>&1 | |||||
then | |||||
against=HEAD | |||||
else | |||||
# Initial commit: diff against an empty tree object | |||||
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |||||
fi | |||||
# If you want to allow non-ASCII filenames set this variable to true. | |||||
allownonascii=$(git config --bool hooks.allownonascii) | |||||
# Redirect output to stderr. | |||||
exec 1>&2 | |||||
# Cross platform projects tend to avoid non-ASCII filenames; prevent | |||||
# them from being added to the repository. We exploit the fact that the | |||||
# printable range starts at the space character and ends with tilde. | |||||
if [ "$allownonascii" != "true" ] && | |||||
# Note that the use of brackets around a tr range is ok here, (it's | |||||
# even required, for portability to Solaris 10's /usr/bin/tr), since | |||||
# the square bracket bytes happen to fall in the designated range. | |||||
test $(git diff --cached --name-only --diff-filter=A -z $against | | |||||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 | |||||
then | |||||
cat <<\EOF | |||||
Error: Attempt to add a non-ASCII file name. | |||||
This can cause problems if you want to work with people on other platforms. | |||||
To be portable it is advisable to rename the file. | |||||
If you know what you are doing you can disable this check using: | |||||
git config hooks.allownonascii true | |||||
EOF | |||||
exit 1 | |||||
fi | |||||
# If there are whitespace errors, print the offending file names and fail. | |||||
exec git diff-index --check --cached $against -- |
@@ -0,0 +1,53 @@ | |||||
#!/bin/sh | |||||
# An example hook script to verify what is about to be pushed. Called by "git | |||||
# push" after it has checked the remote status, but before anything has been | |||||
# pushed. If this script exits with a non-zero status nothing will be pushed. | |||||
# | |||||
# This hook is called with the following parameters: | |||||
# | |||||
# $1 -- Name of the remote to which the push is being done | |||||
# $2 -- URL to which the push is being done | |||||
# | |||||
# If pushing without using a named remote those arguments will be equal. | |||||
# | |||||
# Information about the commits which are being pushed is supplied as lines to | |||||
# the standard input in the form: | |||||
# | |||||
# <local ref> <local sha1> <remote ref> <remote sha1> | |||||
# | |||||
# This sample shows how to prevent push of commits where the log message starts | |||||
# with "WIP" (work in progress). | |||||
remote="$1" | |||||
url="$2" | |||||
z40=0000000000000000000000000000000000000000 | |||||
while read local_ref local_sha remote_ref remote_sha | |||||
do | |||||
if [ "$local_sha" = $z40 ] | |||||
then | |||||
# Handle delete | |||||
: | |||||
else | |||||
if [ "$remote_sha" = $z40 ] | |||||
then | |||||
# New branch, examine all commits | |||||
range="$local_sha" | |||||
else | |||||
# Update to existing branch, examine new commits | |||||
range="$remote_sha..$local_sha" | |||||
fi | |||||
# Check for WIP commit | |||||
commit=`git rev-list -n 1 --grep '^WIP' "$range"` | |||||
if [ -n "$commit" ] | |||||
then | |||||
echo >&2 "Found WIP commit in $local_ref, not pushing" | |||||
exit 1 | |||||
fi | |||||
fi | |||||
done | |||||
exit 0 |
@@ -0,0 +1,169 @@ | |||||
#!/bin/sh | |||||
# | |||||
# Copyright (c) 2006, 2008 Junio C Hamano | |||||
# | |||||
# The "pre-rebase" hook is run just before "git rebase" starts doing | |||||
# its job, and can prevent the command from running by exiting with | |||||
# non-zero status. | |||||
# | |||||
# The hook is called with the following parameters: | |||||
# | |||||
# $1 -- the upstream the series was forked from. | |||||
# $2 -- the branch being rebased (or empty when rebasing the current branch). | |||||
# | |||||
# This sample shows how to prevent topic branches that are already | |||||
# merged to 'next' branch from getting rebased, because allowing it | |||||
# would result in rebasing already published history. | |||||
publish=next | |||||
basebranch="$1" | |||||
if test "$#" = 2 | |||||
then | |||||
topic="refs/heads/$2" | |||||
else | |||||
topic=`git symbolic-ref HEAD` || | |||||
exit 0 ;# we do not interrupt rebasing detached HEAD | |||||
fi | |||||
case "$topic" in | |||||
refs/heads/??/*) | |||||
;; | |||||
*) | |||||
exit 0 ;# we do not interrupt others. | |||||
;; | |||||
esac | |||||
# Now we are dealing with a topic branch being rebased | |||||
# on top of master. Is it OK to rebase it? | |||||
# Does the topic really exist? | |||||
git show-ref -q "$topic" || { | |||||
echo >&2 "No such branch $topic" | |||||
exit 1 | |||||
} | |||||
# Is topic fully merged to master? | |||||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"` | |||||
if test -z "$not_in_master" | |||||
then | |||||
echo >&2 "$topic is fully merged to master; better remove it." | |||||
exit 1 ;# we could allow it, but there is no point. | |||||
fi | |||||
# Is topic ever merged to next? If so you should not be rebasing it. | |||||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` | |||||
only_next_2=`git rev-list ^master ${publish} | sort` | |||||
if test "$only_next_1" = "$only_next_2" | |||||
then | |||||
not_in_topic=`git rev-list "^$topic" master` | |||||
if test -z "$not_in_topic" | |||||
then | |||||
echo >&2 "$topic is already up to date with master" | |||||
exit 1 ;# we could allow it, but there is no point. | |||||
else | |||||
exit 0 | |||||
fi | |||||
else | |||||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` | |||||
/usr/bin/perl -e ' | |||||
my $topic = $ARGV[0]; | |||||
my $msg = "* $topic has commits already merged to public branch:\n"; | |||||
my (%not_in_next) = map { | |||||
/^([0-9a-f]+) /; | |||||
($1 => 1); | |||||
} split(/\n/, $ARGV[1]); | |||||
for my $elem (map { | |||||
/^([0-9a-f]+) (.*)$/; | |||||
[$1 => $2]; | |||||
} split(/\n/, $ARGV[2])) { | |||||
if (!exists $not_in_next{$elem->[0]}) { | |||||
if ($msg) { | |||||
print STDERR $msg; | |||||
undef $msg; | |||||
} | |||||
print STDERR " $elem->[1]\n"; | |||||
} | |||||
} | |||||
' "$topic" "$not_in_next" "$not_in_master" | |||||
exit 1 | |||||
fi | |||||
<<\DOC_END | |||||
This sample hook safeguards topic branches that have been | |||||
published from being rewound. | |||||
The workflow assumed here is: | |||||
* Once a topic branch forks from "master", "master" is never | |||||
merged into it again (either directly or indirectly). | |||||
* Once a topic branch is fully cooked and merged into "master", | |||||
it is deleted. If you need to build on top of it to correct | |||||
earlier mistakes, a new topic branch is created by forking at | |||||
the tip of the "master". This is not strictly necessary, but | |||||
it makes it easier to keep your history simple. | |||||
* Whenever you need to test or publish your changes to topic | |||||
branches, merge them into "next" branch. | |||||
The script, being an example, hardcodes the publish branch name | |||||
to be "next", but it is trivial to make it configurable via | |||||
$GIT_DIR/config mechanism. | |||||
With this workflow, you would want to know: | |||||
(1) ... if a topic branch has ever been merged to "next". Young | |||||
topic branches can have stupid mistakes you would rather | |||||
clean up before publishing, and things that have not been | |||||
merged into other branches can be easily rebased without | |||||
affecting other people. But once it is published, you would | |||||
not want to rewind it. | |||||
(2) ... if a topic branch has been fully merged to "master". | |||||
Then you can delete it. More importantly, you should not | |||||
build on top of it -- other people may already want to | |||||
change things related to the topic as patches against your | |||||
"master", so if you need further changes, it is better to | |||||
fork the topic (perhaps with the same name) afresh from the | |||||
tip of "master". | |||||
Let's look at this example: | |||||
o---o---o---o---o---o---o---o---o---o "next" | |||||
/ / / / | |||||
/ a---a---b A / / | |||||
/ / / / | |||||
/ / c---c---c---c B / | |||||
/ / / \ / | |||||
/ / / b---b C \ / | |||||
/ / / / \ / | |||||
---o---o---o---o---o---o---o---o---o---o---o "master" | |||||
A, B and C are topic branches. | |||||
* A has one fix since it was merged up to "next". | |||||
* B has finished. It has been fully merged up to "master" and "next", | |||||
and is ready to be deleted. | |||||
* C has not merged to "next" at all. | |||||
We would want to allow C to be rebased, refuse A, and encourage | |||||
B to be deleted. | |||||
To compute (1): | |||||
git rev-list ^master ^topic next | |||||
git rev-list ^master next | |||||
if these match, topic has not merged in next at all. | |||||
To compute (2): | |||||
git rev-list master..topic | |||||
if this is empty, it is fully merged to "master". | |||||
DOC_END |
@@ -0,0 +1,15 @@ | |||||
#!/usr/bin/env bash | |||||
data=$(cat) | |||||
exitcodes="" | |||||
hookname=$(basename $0) | |||||
GIT_DIR=${GIT_DIR:-$(dirname $0)} | |||||
for hook in ${GIT_DIR}/hooks/${hookname}.d/*; do | |||||
test -x "${hook}" || continue | |||||
echo "${data}" | "${hook}" | |||||
exitcodes="${exitcodes} $?" | |||||
done | |||||
for i in ${exitcodes}; do | |||||
[ ${i} -eq 0 ] || exit ${i} | |||||
done |
@@ -0,0 +1,2 @@ | |||||
#!/usr/bin/env bash | |||||
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' pre-receive |
@@ -0,0 +1,24 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to make use of push options. | |||||
# The example simply echoes all push options that start with 'echoback=' | |||||
# and rejects all pushes when the "reject" push option is used. | |||||
# | |||||
# To enable this hook, rename this file to "pre-receive". | |||||
if test -n "$GIT_PUSH_OPTION_COUNT" | |||||
then | |||||
i=0 | |||||
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" | |||||
do | |||||
eval "value=\$GIT_PUSH_OPTION_$i" | |||||
case "$value" in | |||||
echoback=*) | |||||
echo "echo from the pre-receive-hook: ${value#*=}" >&2 | |||||
;; | |||||
reject) | |||||
exit 1 | |||||
esac | |||||
i=$((i + 1)) | |||||
done | |||||
fi |
@@ -0,0 +1,42 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to prepare the commit log message. | |||||
# Called by "git commit" with the name of the file that has the | |||||
# commit message, followed by the description of the commit | |||||
# message's source. The hook's purpose is to edit the commit | |||||
# message file. If the hook fails with a non-zero status, | |||||
# the commit is aborted. | |||||
# | |||||
# To enable this hook, rename this file to "prepare-commit-msg". | |||||
# This hook includes three examples. The first one removes the | |||||
# "# Please enter the commit message..." help message. | |||||
# | |||||
# The second includes the output of "git diff --name-status -r" | |||||
# into the message, just before the "git status" output. It is | |||||
# commented because it doesn't cope with --amend or with squashed | |||||
# commits. | |||||
# | |||||
# The third example adds a Signed-off-by line to the message, that can | |||||
# still be edited. This is rarely a good idea. | |||||
COMMIT_MSG_FILE=$1 | |||||
COMMIT_SOURCE=$2 | |||||
SHA1=$3 | |||||
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" | |||||
# case "$COMMIT_SOURCE,$SHA1" in | |||||
# ,|template,) | |||||
# /usr/bin/perl -i.bak -pe ' | |||||
# print "\n" . `git diff --cached --name-status -r` | |||||
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; | |||||
# *) ;; | |||||
# esac | |||||
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') | |||||
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" | |||||
# if test -z "$COMMIT_SOURCE" | |||||
# then | |||||
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" | |||||
# fi |
@@ -0,0 +1,14 @@ | |||||
#!/usr/bin/env bash | |||||
exitcodes="" | |||||
hookname=$(basename $0) | |||||
GIT_DIR=${GIT_DIR:-$(dirname $0)} | |||||
for hook in ${GIT_DIR}/hooks/${hookname}.d/*; do | |||||
test -x "${hook}" || continue | |||||
"${hook}" $1 $2 $3 | |||||
exitcodes="${exitcodes} $?" | |||||
done | |||||
for i in ${exitcodes}; do | |||||
[ ${i} -eq 0 ] || exit ${i} | |||||
done |
@@ -0,0 +1,2 @@ | |||||
#!/usr/bin/env bash | |||||
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' update $1 $2 $3 |
@@ -0,0 +1,128 @@ | |||||
#!/bin/sh | |||||
# | |||||
# An example hook script to block unannotated tags from entering. | |||||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new | |||||
# | |||||
# To enable this hook, rename this file to "update". | |||||
# | |||||
# Config | |||||
# ------ | |||||
# hooks.allowunannotated | |||||
# This boolean sets whether unannotated tags will be allowed into the | |||||
# repository. By default they won't be. | |||||
# hooks.allowdeletetag | |||||
# This boolean sets whether deleting tags will be allowed in the | |||||
# repository. By default they won't be. | |||||
# hooks.allowmodifytag | |||||
# This boolean sets whether a tag may be modified after creation. By default | |||||
# it won't be. | |||||
# hooks.allowdeletebranch | |||||
# This boolean sets whether deleting branches will be allowed in the | |||||
# repository. By default they won't be. | |||||
# hooks.denycreatebranch | |||||
# This boolean sets whether remotely creating branches will be denied | |||||
# in the repository. By default this is allowed. | |||||
# | |||||
# --- Command line | |||||
refname="$1" | |||||
oldrev="$2" | |||||
newrev="$3" | |||||
# --- Safety check | |||||
if [ -z "$GIT_DIR" ]; then | |||||
echo "Don't run this script from the command line." >&2 | |||||
echo " (if you want, you could supply GIT_DIR then run" >&2 | |||||
echo " $0 <ref> <oldrev> <newrev>)" >&2 | |||||
exit 1 | |||||
fi | |||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then | |||||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2 | |||||
exit 1 | |||||
fi | |||||
# --- Config | |||||
allowunannotated=$(git config --bool hooks.allowunannotated) | |||||
allowdeletebranch=$(git config --bool hooks.allowdeletebranch) | |||||
denycreatebranch=$(git config --bool hooks.denycreatebranch) | |||||
allowdeletetag=$(git config --bool hooks.allowdeletetag) | |||||
allowmodifytag=$(git config --bool hooks.allowmodifytag) | |||||
# check for no description | |||||
projectdesc=$(sed -e '1q' "$GIT_DIR/description") | |||||
case "$projectdesc" in | |||||
"Unnamed repository"* | "") | |||||
echo "*** Project description file hasn't been set" >&2 | |||||
exit 1 | |||||
;; | |||||
esac | |||||
# --- Check types | |||||
# if $newrev is 0000...0000, it's a commit to delete a ref. | |||||
zero="0000000000000000000000000000000000000000" | |||||
if [ "$newrev" = "$zero" ]; then | |||||
newrev_type=delete | |||||
else | |||||
newrev_type=$(git cat-file -t $newrev) | |||||
fi | |||||
case "$refname","$newrev_type" in | |||||
refs/tags/*,commit) | |||||
# un-annotated tag | |||||
short_refname=${refname##refs/tags/} | |||||
if [ "$allowunannotated" != "true" ]; then | |||||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 | |||||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
refs/tags/*,delete) | |||||
# delete tag | |||||
if [ "$allowdeletetag" != "true" ]; then | |||||
echo "*** Deleting a tag is not allowed in this repository" >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
refs/tags/*,tag) | |||||
# annotated tag | |||||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 | |||||
then | |||||
echo "*** Tag '$refname' already exists." >&2 | |||||
echo "*** Modifying a tag is not allowed in this repository." >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
refs/heads/*,commit) | |||||
# branch | |||||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then | |||||
echo "*** Creating a branch is not allowed in this repository" >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
refs/heads/*,delete) | |||||
# delete branch | |||||
if [ "$allowdeletebranch" != "true" ]; then | |||||
echo "*** Deleting a branch is not allowed in this repository" >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
refs/remotes/*,commit) | |||||
# tracking branch | |||||
;; | |||||
refs/remotes/*,delete) | |||||
# delete tracking branch | |||||
if [ "$allowdeletebranch" != "true" ]; then | |||||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2 | |||||
exit 1 | |||||
fi | |||||
;; | |||||
*) | |||||
# Anything else (is there anything else?) | |||||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 | |||||
exit 1 | |||||
;; | |||||
esac | |||||
# --- Finished | |||||
exit 0 |
@@ -0,0 +1,6 @@ | |||||
# git ls-files --others --exclude-from=.git/info/exclude | |||||
# Lines that start with '#' are comments. | |||||
# For a project mostly in C, the following would be a good set of | |||||
# exclude patterns (uncomment them if you want to use them): | |||||
# *.[oa] | |||||
# *~ |
@@ -0,0 +1 @@ | |||||
808038d2f71b0ab020991439cffd24309c7bc530 refs/heads/master |
@@ -0,0 +1 @@ | |||||
@@ -0,0 +1 @@ | |||||
808038d2f71b0ab020991439cffd24309c7bc530 |
@@ -7,10 +7,12 @@ package integrations | |||||
import ( | import ( | ||||
"fmt" | "fmt" | ||||
"net/http" | "net/http" | ||||
"strings" | |||||
"testing" | "testing" | ||||
"code.gitea.io/gitea/modules/setting" | "code.gitea.io/gitea/modules/setting" | ||||
"github.com/PuerkitoBio/goquery" | |||||
"github.com/stretchr/testify/assert" | "github.com/stretchr/testify/assert" | ||||
) | ) | ||||
@@ -74,3 +76,26 @@ func TestViewRepo1CloneLinkAuthorized(t *testing.T) { | |||||
sshURL := fmt.Sprintf("ssh://%s@%s:%d/user2/repo1.git", setting.RunUser, setting.SSH.Domain, setting.SSH.Port) | sshURL := fmt.Sprintf("ssh://%s@%s:%d/user2/repo1.git", setting.RunUser, setting.SSH.Domain, setting.SSH.Port) | ||||
assert.Equal(t, sshURL, link) | assert.Equal(t, sshURL, link) | ||||
} | } | ||||
func TestViewRepoWithSymlinks(t *testing.T) { | |||||
prepareTestEnv(t) | |||||
session := loginUser(t, "user2") | |||||
req := NewRequest(t, "GET", "/user2/repo20.git") | |||||
resp := session.MakeRequest(t, req, http.StatusOK) | |||||
htmlDoc := NewHTMLParser(t, resp.Body) | |||||
files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR > TD.name") | |||||
items := files.Map(func(i int, s *goquery.Selection) string { | |||||
cls, _ := s.Find("SPAN").Attr("class") | |||||
file := strings.Trim(s.Find("A").Text(), " \t\n") | |||||
return fmt.Sprintf("%s: %s", file, cls) | |||||
}) | |||||
assert.Equal(t, len(items), 5) | |||||
assert.Equal(t, items[0], "a: octicon octicon-file-directory") | |||||
assert.Equal(t, items[1], "link_b: octicon octicon-file-symlink-directory") | |||||
assert.Equal(t, items[2], "link_d: octicon octicon-file-symlink-file") | |||||
assert.Equal(t, items[3], "link_hi: octicon octicon-file-symlink-file") | |||||
assert.Equal(t, items[4], "link_link: octicon octicon-file-symlink-file") | |||||
} |
@@ -67,3 +67,10 @@ | |||||
type: 5 | type: 5 | ||||
config: "{}" | config: "{}" | ||||
created_unix: 946684810 | created_unix: 946684810 | ||||
- | |||||
id: 11 | |||||
repo_id: 31 | |||||
type: 1 | |||||
config: "{}" | |||||
created_unix: 1524304355 |
@@ -378,4 +378,14 @@ | |||||
num_pulls: 0 | num_pulls: 0 | ||||
num_closed_pulls: 0 | num_closed_pulls: 0 | ||||
is_mirror: false | is_mirror: false | ||||
is_fork: true | |||||
is_fork: true | |||||
- | |||||
id: 31 | |||||
owner_id: 2 | |||||
lower_name: repo20 | |||||
name: repo20 | |||||
num_stars: 0 | |||||
num_forks: 0 | |||||
num_issues: 0 | |||||
is_mirror: false |
@@ -27,7 +27,7 @@ | |||||
is_admin: false | is_admin: false | ||||
avatar: avatar2 | avatar: avatar2 | ||||
avatar_email: user2@example.com | avatar_email: user2@example.com | ||||
num_repos: 4 | |||||
num_repos: 5 | |||||
num_stars: 2 | num_stars: 2 | ||||
num_followers: 2 | num_followers: 2 | ||||
num_following: 1 | num_following: 1 | ||||
@@ -313,4 +313,4 @@ | |||||
avatar: avatar20 | avatar: avatar20 | ||||
avatar_email: user20@example.com | avatar_email: user20@example.com | ||||
num_repos: 4 | num_repos: 4 | ||||
is_active: true | |||||
is_active: true |
@@ -23,6 +23,7 @@ import ( | |||||
"unicode" | "unicode" | ||||
"unicode/utf8" | "unicode/utf8" | ||||
"code.gitea.io/git" | |||||
"code.gitea.io/gitea/modules/log" | "code.gitea.io/gitea/modules/log" | ||||
"code.gitea.io/gitea/modules/setting" | "code.gitea.io/gitea/modules/setting" | ||||
"code.gitea.io/gitea/modules/util" | "code.gitea.io/gitea/modules/util" | ||||
@@ -559,3 +560,25 @@ func IsPDFFile(data []byte) bool { | |||||
func IsVideoFile(data []byte) bool { | func IsVideoFile(data []byte) bool { | ||||
return strings.Index(http.DetectContentType(data), "video/") != -1 | return strings.Index(http.DetectContentType(data), "video/") != -1 | ||||
} | } | ||||
// EntryIcon returns the octicon class for displaying files/directories | |||||
func EntryIcon(entry *git.TreeEntry) string { | |||||
switch { | |||||
case entry.IsLink(): | |||||
te, err := entry.FollowLink() | |||||
if err != nil { | |||||
log.Debug(err.Error()) | |||||
return "file-symlink-file" | |||||
} | |||||
if te.IsDir() { | |||||
return "file-symlink-directory" | |||||
} | |||||
return "file-symlink-file" | |||||
case entry.IsDir(): | |||||
return "file-directory" | |||||
case entry.IsSubModule(): | |||||
return "file-submodule" | |||||
} | |||||
return "file-text" | |||||
} |
@@ -75,6 +75,7 @@ func NewFuncMap() []template.FuncMap { | |||||
"RawTimeSince": base.RawTimeSince, | "RawTimeSince": base.RawTimeSince, | ||||
"FileSize": base.FileSize, | "FileSize": base.FileSize, | ||||
"Subtract": base.Subtract, | "Subtract": base.Subtract, | ||||
"EntryIcon": base.EntryIcon, | |||||
"Add": func(a, b int) int { | "Add": func(a, b int) int { | ||||
return a + b | return a + b | ||||
}, | }, | ||||
@@ -237,7 +237,8 @@ | |||||
&.octicon-mail-reply { | &.octicon-mail-reply { | ||||
margin-right: 10px; | margin-right: 10px; | ||||
} | } | ||||
&.octicon-file-directory, &.octicon-file-submodule { | |||||
&.octicon-file-directory, &.octicon-file-submodule, | |||||
&.octicon-file-symlink-directory { | |||||
color: #1e70bf; | color: #1e70bf; | ||||
} | } | ||||
} | } | ||||
@@ -73,7 +73,7 @@ | |||||
{{end}} | {{end}} | ||||
</a> | </a> | ||||
{{else}} | {{else}} | ||||
<span class="octicon octicon-file-text"></span> | |||||
<span class="octicon octicon-{{EntryIcon $entry}}"></span> | |||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}">{{$entry.Name}}</a> | <a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}">{{$entry.Name}}</a> | ||||
{{end}} | {{end}} | ||||
</td> | </td> | ||||
@@ -18,3 +18,4 @@ Antoine Girard <sapk@sapk.fr> (@sapk) | |||||
Jonas Östanbäck <jonas.ostanback@gmail.com> (@cez81) | Jonas Östanbäck <jonas.ostanback@gmail.com> (@cez81) | ||||
David Schneiderbauer <dschneiderbauer@gmail.com> (@daviian) | David Schneiderbauer <dschneiderbauer@gmail.com> (@daviian) | ||||
Peter Žeby <morlinest@gmail.com> (@morlinest) | Peter Žeby <morlinest@gmail.com> (@morlinest) | ||||
Jonas Franz <info@jonasfranz.software> (@JonasFranzDEV) |
@@ -40,6 +40,16 @@ func (err ErrNotExist) Error() string { | |||||
return fmt.Sprintf("object does not exist [id: %s, rel_path: %s]", err.ID, err.RelPath) | return fmt.Sprintf("object does not exist [id: %s, rel_path: %s]", err.ID, err.RelPath) | ||||
} | } | ||||
// ErrBadLink entry.FollowLink error | |||||
type ErrBadLink struct { | |||||
Name string | |||||
Message string | |||||
} | |||||
func (err ErrBadLink) Error() string { | |||||
return fmt.Sprintf("%s: %s", err.Name, err.Message) | |||||
} | |||||
// ErrUnsupportedVersion error when required git version not matched | // ErrUnsupportedVersion error when required git version not matched | ||||
type ErrUnsupportedVersion struct { | type ErrUnsupportedVersion struct { | ||||
Required string | Required string | ||||
@@ -5,6 +5,7 @@ | |||||
package git | package git | ||||
import ( | import ( | ||||
"bytes" | |||||
"encoding/hex" | "encoding/hex" | ||||
"fmt" | "fmt" | ||||
"strings" | "strings" | ||||
@@ -26,43 +27,23 @@ func (id SHA1) Equal(s2 interface{}) bool { | |||||
} | } | ||||
return v == id.String() | return v == id.String() | ||||
case []byte: | case []byte: | ||||
if len(v) != 20 { | |||||
return false | |||||
} | |||||
for i, v := range v { | |||||
if id[i] != v { | |||||
return false | |||||
} | |||||
} | |||||
return bytes.Equal(v, id[:]) | |||||
case SHA1: | case SHA1: | ||||
for i, v := range v { | |||||
if id[i] != v { | |||||
return false | |||||
} | |||||
} | |||||
return v == id | |||||
default: | default: | ||||
return false | return false | ||||
} | } | ||||
return true | |||||
} | } | ||||
// String returns string (hex) representation of the Oid. | // String returns string (hex) representation of the Oid. | ||||
func (id SHA1) String() string { | func (id SHA1) String() string { | ||||
result := make([]byte, 0, 40) | |||||
hexvalues := []byte("0123456789abcdef") | |||||
for i := 0; i < 20; i++ { | |||||
result = append(result, hexvalues[id[i]>>4]) | |||||
result = append(result, hexvalues[id[i]&0xf]) | |||||
} | |||||
return string(result) | |||||
return hex.EncodeToString(id[:]) | |||||
} | } | ||||
// MustID always creates a new SHA1 from a [20]byte array with no validation of input. | // MustID always creates a new SHA1 from a [20]byte array with no validation of input. | ||||
func MustID(b []byte) SHA1 { | func MustID(b []byte) SHA1 { | ||||
var id SHA1 | var id SHA1 | ||||
for i := 0; i < 20; i++ { | |||||
id[i] = b[i] | |||||
} | |||||
copy(id[:], b) | |||||
return id | return id | ||||
} | } | ||||
@@ -5,6 +5,7 @@ | |||||
package git | package git | ||||
import ( | import ( | ||||
"io" | |||||
"sort" | "sort" | ||||
"strconv" | "strconv" | ||||
"strings" | "strings" | ||||
@@ -90,6 +91,45 @@ func (te *TreeEntry) Blob() *Blob { | |||||
} | } | ||||
} | } | ||||
// FollowLink returns the entry pointed to by a symlink | |||||
func (te *TreeEntry) FollowLink() (*TreeEntry, error) { | |||||
if !te.IsLink() { | |||||
return nil, ErrBadLink{te.Name(), "not a symlink"} | |||||
} | |||||
// read the link | |||||
r, err := te.Blob().Data() | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
buf := make([]byte, te.Size()) | |||||
_, err = io.ReadFull(r, buf) | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
lnk := string(buf) | |||||
t := te.ptree | |||||
// traverse up directories | |||||
for ; t != nil && strings.HasPrefix(lnk, "../"); lnk = lnk[3:] { | |||||
t = t.ptree | |||||
} | |||||
if t == nil { | |||||
return nil, ErrBadLink{te.Name(), "points outside of repo"} | |||||
} | |||||
target, err := t.GetTreeEntryByPath(lnk) | |||||
if err != nil { | |||||
if IsErrNotExist(err) { | |||||
return nil, ErrBadLink{te.Name(), "broken link"} | |||||
} | |||||
return nil, err | |||||
} | |||||
return target, nil | |||||
} | |||||
// GetSubJumpablePathName return the full path of subdirectory jumpable ( contains only one directory ) | // GetSubJumpablePathName return the full path of subdirectory jumpable ( contains only one directory ) | ||||
func (te *TreeEntry) GetSubJumpablePathName() string { | func (te *TreeEntry) GetSubJumpablePathName() string { | ||||
if te.IsSubModule() || !te.IsDir() { | if te.IsSubModule() || !te.IsDir() { | ||||
@@ -3,10 +3,10 @@ | |||||
"ignore": "test appengine", | "ignore": "test appengine", | ||||
"package": [ | "package": [ | ||||
{ | { | ||||
"checksumSHA1": "j6YyQxuOYRs94MVEamvnbE6ZtD0=", | |||||
"checksumSHA1": "BfL4Z7P1alyUUNspKJu7Q4GPCNs=", | |||||
"path": "code.gitea.io/git", | "path": "code.gitea.io/git", | ||||
"revision": "827f97aaaa6a4ab5c31b1b799c56687a8cf6aade", | |||||
"revisionTime": "2018-02-10T03:05:43Z" | |||||
"revision": "f1ecc138bebcffed32be1a574ed0c2701b33733f", | |||||
"revisionTime": "2018-04-21T01:08:19Z" | |||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "PWaIU7g1YSkETxka2DIS1EYsPK0=", | "checksumSHA1": "PWaIU7g1YSkETxka2DIS1EYsPK0=", | ||||