From 077160b8384f100aa1327a86d6d3c08969e679c2 Mon Sep 17 00:00:00 2001
From: oliverpool <3864879+oliverpool@users.noreply.github.com>
Date: Sat, 22 Apr 2023 18:30:24 +0200
Subject: [PATCH] fix calReleaseNumCommitsBehind (#24148) (#24197)
Backport #24148
`repoCtx.CommitsCount` is not reliably the commit count of the default
branch (Repository.GetCommitsCount depends on what is currently
displayed).
_contributed in the context of @forgejo_
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
---
models/db/iterate_test.go | 2 +-
models/db/list_test.go | 4 +-
models/fixtures/release.yml | 42 +++++
models/fixtures/repo_unit.yml | 27 +++
models/fixtures/repository.yml | 14 ++
models/fixtures/user.yml | 2 +-
models/repo/repo_list_test.go | 6 +-
routers/web/repo/release.go | 9 +-
.../user2/repo-release.git/HEAD | 1 +
.../user2/repo-release.git/config | 4 +
.../user2/repo-release.git/description | 1 +
.../hooks/applypatch-msg.sample | 15 ++
.../repo-release.git/hooks/commit-msg.sample | 24 +++
.../hooks/fsmonitor-watchman.sample | 174 ++++++++++++++++++
.../repo-release.git/hooks/post-update.sample | 8 +
.../hooks/pre-applypatch.sample | 14 ++
.../repo-release.git/hooks/pre-commit.sample | 49 +++++
.../hooks/pre-merge-commit.sample | 13 ++
.../repo-release.git/hooks/pre-push.sample | 53 ++++++
.../repo-release.git/hooks/pre-rebase.sample | 169 +++++++++++++++++
.../repo-release.git/hooks/pre-receive.sample | 24 +++
.../hooks/prepare-commit-msg.sample | 42 +++++
.../hooks/push-to-checkout.sample | 78 ++++++++
.../repo-release.git/hooks/update.sample | 128 +++++++++++++
.../user2/repo-release.git/info/exclude | 6 +
.../08/9ba8b2f324d89b74f6853374a0476b312a46f6 | Bin 0 -> 54 bytes
.../18/4288e5acffbcb17160b990e8efe83b12dfaaba | Bin 0 -> 127 bytes
.../24/3cdd85d09ce4104855edf219c05b74c65350fc | Bin 0 -> 85 bytes
.../43/80f99290b2b3922733ff82c57afad915ace907 | Bin 0 -> 158 bytes
.../6d/fe48a18ce2fb47d3a75e13c7ab35f935077535 | Bin 0 -> 50 bytes
.../71/97b56fdc75b453f47c9110938cb46a303579fd | Bin 0 -> 153 bytes
.../79/f9d88f1b054d650f88da0bd658e21f7b0cf6ec | Bin 0 -> 156 bytes
.../7c/055ef1678b03b831bbe7b9ca5aed33b1a8dea0 | Bin 0 -> 53 bytes
.../80/abeef37c96b85b83a916f5f295f04f4d380a42 | Bin 0 -> 85 bytes
.../a8/a700e8c644c783ba2c6e742bb81bf91e244bff | Bin 0 -> 153 bytes
.../bc/7068d1eb2f93a04e3ec73521473444ceec0961 | Bin 0 -> 58 bytes
.../c4/a4e1a72a2098d687b4280e7c6972280c1f9c39 | Bin 0 -> 166 bytes
.../cd/7f28e1b404377eadbe0d54234ba861883e6930 | Bin 0 -> 96 bytes
.../ce/f06e48f2642cd0dc9597b4bea09f4b3f74aad6 | Bin 0 -> 159 bytes
.../d0/718fe871fbb54da104ff201f75f62a6ced2e29 | Bin 0 -> 54 bytes
.../d4/613f8dad1fa61e415922f6eb33244358fca85d | Bin 0 -> 84 bytes
.../dd/5488178fc8a5c62430b3fb3017203b917b95ab | Bin 0 -> 38 bytes
.../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes
.../ef/3c849ed54b22bb1f500da91b789c40cb0915da | Bin 0 -> 97 bytes
.../f3/f1c90ac949aa1b0f129d30f338d408663c8a83 | 2 +
.../f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc | Bin 0 -> 54 bytes
.../user2/repo-release.git/refs/heads/main | 1 +
.../user2/repo-release.git/refs/heads/master | 1 +
.../user2/repo-release.git/refs/tags/v1.0 | 1 +
.../user2/repo-release.git/refs/tags/v1.1 | 1 +
.../user2/repo-release.git/refs/tags/v2.0 | 1 +
tests/integration/api_repo_test.go | 6 +-
tests/integration/release_test.go | 33 +++-
53 files changed, 934 insertions(+), 21 deletions(-)
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/HEAD
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/config
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/description
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/applypatch-msg.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/commit-msg.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/fsmonitor-watchman.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/post-update.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-applypatch.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-commit.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-merge-commit.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-push.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-rebase.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-receive.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/prepare-commit-msg.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/push-to-checkout.sample
create mode 100755 tests/gitea-repositories-meta/user2/repo-release.git/hooks/update.sample
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/info/exclude
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/08/9ba8b2f324d89b74f6853374a0476b312a46f6
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/18/4288e5acffbcb17160b990e8efe83b12dfaaba
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/24/3cdd85d09ce4104855edf219c05b74c65350fc
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/43/80f99290b2b3922733ff82c57afad915ace907
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/6d/fe48a18ce2fb47d3a75e13c7ab35f935077535
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/71/97b56fdc75b453f47c9110938cb46a303579fd
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/79/f9d88f1b054d650f88da0bd658e21f7b0cf6ec
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/7c/055ef1678b03b831bbe7b9ca5aed33b1a8dea0
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/80/abeef37c96b85b83a916f5f295f04f4d380a42
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/a8/a700e8c644c783ba2c6e742bb81bf91e244bff
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/bc/7068d1eb2f93a04e3ec73521473444ceec0961
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/c4/a4e1a72a2098d687b4280e7c6972280c1f9c39
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/cd/7f28e1b404377eadbe0d54234ba861883e6930
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/ce/f06e48f2642cd0dc9597b4bea09f4b3f74aad6
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/d0/718fe871fbb54da104ff201f75f62a6ced2e29
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/d4/613f8dad1fa61e415922f6eb33244358fca85d
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/dd/5488178fc8a5c62430b3fb3017203b917b95ab
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/ef/3c849ed54b22bb1f500da91b789c40cb0915da
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/f3/f1c90ac949aa1b0f129d30f338d408663c8a83
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/objects/f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/main
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/master
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.0
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.1
create mode 100644 tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v2.0
diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go
index a713fe0d8b..d945c53b78 100644
--- a/models/db/iterate_test.go
+++ b/models/db/iterate_test.go
@@ -25,7 +25,7 @@ func TestIterate(t *testing.T) {
return nil
})
assert.NoError(t, err)
- assert.EqualValues(t, 83, repoCnt)
+ assert.EqualValues(t, 88, repoCnt)
err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repoUnit *repo_model.RepoUnit) error {
reopUnit2 := repo_model.RepoUnit{ID: repoUnit.ID}
diff --git a/models/db/list_test.go b/models/db/list_test.go
index ffef1e4948..99add48ac8 100644
--- a/models/db/list_test.go
+++ b/models/db/list_test.go
@@ -35,11 +35,11 @@ func TestFind(t *testing.T) {
var repoUnits []repo_model.RepoUnit
err := db.Find(db.DefaultContext, &opts, &repoUnits)
assert.NoError(t, err)
- assert.EqualValues(t, 83, len(repoUnits))
+ assert.EqualValues(t, 88, len(repoUnits))
cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit))
assert.NoError(t, err)
- assert.EqualValues(t, 83, cnt)
+ assert.EqualValues(t, 88, cnt)
repoUnits = make([]repo_model.RepoUnit, 0, 10)
newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits)
diff --git a/models/fixtures/release.yml b/models/fixtures/release.yml
index 1703f959d2..6d09401ebc 100644
--- a/models/fixtures/release.yml
+++ b/models/fixtures/release.yml
@@ -66,3 +66,45 @@
is_prerelease: true
is_tag: false
created_unix: 946684800
+
+- id: 6
+ repo_id: 57
+ publisher_id: 2
+ tag_name: "v1.0"
+ lower_tag_name: "v1.0"
+ target: "main"
+ title: "v1.0"
+ sha1: "a8a700e8c644c783ba2c6e742bb81bf91e244bff"
+ num_commits: 3
+ is_draft: false
+ is_prerelease: false
+ is_tag: false
+ created_unix: 946684801
+
+- id: 7
+ repo_id: 57
+ publisher_id: 2
+ tag_name: "v1.1"
+ lower_tag_name: "v1.1"
+ target: "main"
+ title: "v1.1"
+ sha1: "cef06e48f2642cd0dc9597b4bea09f4b3f74aad6"
+ num_commits: 5
+ is_draft: false
+ is_prerelease: false
+ is_tag: false
+ created_unix: 946684802
+
+- id: 8
+ repo_id: 57
+ publisher_id: 2
+ tag_name: "v2.0"
+ lower_tag_name: "v2.0"
+ target: "main"
+ title: "v2.0"
+ sha1: "7197b56fdc75b453f47c9110938cb46a303579fd"
+ num_commits: 6
+ is_draft: false
+ is_prerelease: false
+ is_tag: false
+ created_unix: 946684803
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index 503b8c9ddf..20b9c7e3b1 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -1,3 +1,4 @@
+# See models/unit/unit.go for the meaning of the type
-
id: 1
repo_id: 1
@@ -569,3 +570,29 @@
type: 3
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
created_unix: 946684810
+
+-
+ id: 85
+ repo_id: 57
+ type: 1
+ created_unix: 946684810
+-
+ id: 86
+ repo_id: 57
+ type: 2
+ created_unix: 946684810
+-
+ id: 87
+ repo_id: 57
+ type: 3
+ created_unix: 946684810
+-
+ id: 88
+ repo_id: 57
+ type: 4
+ created_unix: 946684810
+-
+ id: 89
+ repo_id: 57
+ type: 5
+ created_unix: 946684810
diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
index dd8facb7a3..3886cd6e8b 100644
--- a/models/fixtures/repository.yml
+++ b/models/fixtures/repository.yml
@@ -1,3 +1,4 @@
+# don't forget to add fixtures in repo_unit.yml
-
id: 1
owner_id: 2
@@ -1634,3 +1635,16 @@
is_private: true
num_issues: 1
status: 0
+
+-
+ id: 57
+ owner_id: 2
+ owner_name: user2
+ lower_name: repo-release
+ name: repo-release
+ default_branch: main
+ is_empty: false
+ is_archived: false
+ is_private: false
+ status: 0
+ num_issues: 0
diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml
index 0624d4903d..db5f6ca37e 100644
--- a/models/fixtures/user.yml
+++ b/models/fixtures/user.yml
@@ -66,7 +66,7 @@
num_followers: 2
num_following: 1
num_stars: 2
- num_repos: 11
+ num_repos: 12
num_teams: 0
num_members: 0
visibility: 0
diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go
index d87d70c189..573281ea0b 100644
--- a/models/repo/repo_list_test.go
+++ b/models/repo/repo_list_test.go
@@ -235,12 +235,12 @@ func TestSearchRepository(t *testing.T) {
{
name: "AllPublic/PublicRepositoriesOfUserIncludingCollaborative",
opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 15, AllPublic: true, Template: util.OptionalBoolFalse},
- count: 29,
+ count: 30,
},
{
name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative",
opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 15, Private: true, AllPublic: true, AllLimited: true, Template: util.OptionalBoolFalse},
- count: 34,
+ count: 35,
},
{
name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName",
@@ -255,7 +255,7 @@ func TestSearchRepository(t *testing.T) {
{
name: "AllPublic/PublicRepositoriesOfOrganization",
opts: &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 17, AllPublic: true, Collaborate: util.OptionalBoolFalse, Template: util.OptionalBoolFalse},
- count: 29,
+ count: 30,
},
{
name: "AllTemplates",
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 63c8797fe5..92b67baff6 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -35,15 +35,10 @@ const (
// calReleaseNumCommitsBehind calculates given release has how many commits behind release target.
func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *repo_model.Release, countCache map[string]int64) error {
- // Fast return if release target is same as default branch.
- if repoCtx.BranchName == release.Target {
- release.NumCommitsBehind = repoCtx.CommitsCount - release.NumCommits
- return nil
- }
-
// Get count if not exists
if _, ok := countCache[release.Target]; !ok {
- if repoCtx.GitRepo.IsBranchExist(release.Target) {
+ // short-circuit for the default branch
+ if repoCtx.Repository.DefaultBranch == release.Target || repoCtx.GitRepo.IsBranchExist(release.Target) {
commit, err := repoCtx.GitRepo.GetBranchCommit(release.Target)
if err != nil {
return fmt.Errorf("GetBranchCommit: %w", err)
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/HEAD b/tests/gitea-repositories-meta/user2/repo-release.git/HEAD
new file mode 100644
index 0000000000..b870d82622
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/config b/tests/gitea-repositories-meta/user2/repo-release.git/config
new file mode 100644
index 0000000000..07d359d07c
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/config
@@ -0,0 +1,4 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = true
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/description b/tests/gitea-repositories-meta/user2/repo-release.git/description
new file mode 100644
index 0000000000..498b267a8c
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/applypatch-msg.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/applypatch-msg.sample
new file mode 100755
index 0000000000..a5d7b84a67
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/applypatch-msg.sample
@@ -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+"$@"}
+:
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/commit-msg.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/commit-msg.sample
new file mode 100755
index 0000000000..b58d1184a9
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/commit-msg.sample
@@ -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
+}
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/fsmonitor-watchman.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/fsmonitor-watchman.sample
new file mode 100755
index 0000000000..23e856f5de
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,174 @@
+#!/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 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. 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, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+ die "Unsupported query-fsmonitor hook version '$version'.\n" .
+ "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+} or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+ my $o = watchman_query();
+ if (is_work_tree_watched($o)) {
+ output_result($o->{clock}, @{$o->{files}});
+ }
+}
+
+sub output_result {
+ my ($clockid, @files) = @_;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # binmode $fh, ":utf8";
+ # print $fh "$clockid\n@files\n";
+ # close $fh;
+
+ binmode STDOUT, ":utf8";
+ print $clockid;
+ print "\0";
+ local $, = "\0";
+ print @files;
+}
+
+sub watchman_clock {
+ my $response = qx/watchman clock "$git_work_tree"/;
+ die "Failed to get clock id on '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+ 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 $last_update_token but not from the .git folder.
+ #
+ # 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.
+ my $last_update_line = "";
+ if (substr($last_update_token, 0, 1) eq "c") {
+ $last_update_token = "\"$last_update_token\"";
+ $last_update_line = qq[\n"since": $last_update_token,];
+ }
+ my $query = <<" END";
+ ["query", "$git_work_tree", {$last_update_line
+ "fields": ["name"],
+ "expression": ["not", ["dirname", ".git"]]
+ }]
+ END
+
+ # Uncomment for debugging the watchman query
+ # open (my $fh, ">", ".git/watchman-query.json");
+ # print $fh $query;
+ # close $fh;
+
+ print CHLD_IN $query;
+ close CHLD_IN;
+ my $response = do {local $/; <CHLD_OUT>};
+
+ # Uncomment for debugging the watch response
+ # open ($fh, ">", ".git/watchman-response.json");
+ # print $fh $response;
+ # close $fh;
+
+ 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 =~ /^\{/;
+
+ return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+ my ($output) = @_;
+ my $error = $output->{error};
+ if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+ $retry--;
+ my $response = qx/watchman watch "$git_work_tree"/;
+ die "Failed to make watchman watch '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+ $output = $json_pkg->new->utf8->decode($response);
+ $error = $output->{error};
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # close $fh;
+
+ # 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.
+ my $o = watchman_clock();
+ $error = $output->{error};
+
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ output_result($o->{clock}, ("/"));
+ $last_update_token = $o->{clock};
+
+ eval { launch_watchman() };
+ return 0;
+ }
+
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ return 1;
+}
+
+sub get_working_dir {
+ my $working_dir;
+ if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $working_dir = Win32::GetCwd();
+ $working_dir =~ tr/\\/\//;
+ } else {
+ require Cwd;
+ $working_dir = Cwd::cwd();
+ }
+
+ return $working_dir;
+}
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/post-update.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/post-update.sample
new file mode 100755
index 0000000000..ec17ec1939
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/post-update.sample
@@ -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
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-applypatch.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-applypatch.sample
new file mode 100755
index 0000000000..4142082bcb
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-applypatch.sample
@@ -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+"$@"}
+:
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-commit.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-commit.sample
new file mode 100755
index 0000000000..e144712c85
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-commit.sample
@@ -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=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=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 --
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-merge-commit.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-merge-commit.sample
new file mode 100755
index 0000000000..399eab1924
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-push.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-push.sample
new file mode 100755
index 0000000000..4ce688d32b
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-push.sample
@@ -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 oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+ if test "$local_oid" = "$zero"
+ then
+ # Handle delete
+ :
+ else
+ if test "$remote_oid" = "$zero"
+ then
+ # New branch, examine all commits
+ range="$local_oid"
+ else
+ # Update to existing branch, examine new commits
+ range="$remote_oid..$local_oid"
+ fi
+
+ # Check for WIP commit
+ commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+ if test -n "$commit"
+ then
+ echo >&2 "Found WIP commit in $local_ref, not pushing"
+ exit 1
+ fi
+ fi
+done
+
+exit 0
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-rebase.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-rebase.sample
new file mode 100755
index 0000000000..6cbef5c370
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-rebase.sample
@@ -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
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-receive.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-receive.sample
new file mode 100755
index 0000000000..a1fd29ec14
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/pre-receive.sample
@@ -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
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/prepare-commit-msg.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/prepare-commit-msg.sample
new file mode 100755
index 0000000000..10fa14c5ab
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/prepare-commit-msg.sample
@@ -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
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/push-to-checkout.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/push-to-checkout.sample
new file mode 100755
index 0000000000..af5a0c0018
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+ echo >&2 "$*"
+ exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+ die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+ die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+ head=HEAD
+else
+ head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+ die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+ die "Could not update working tree to new HEAD"
+fi
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/hooks/update.sample b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/update.sample
new file mode 100755
index 0000000000..c4d426bc6e
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/hooks/update.sample
@@ -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 --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=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=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+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
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/info/exclude b/tests/gitea-repositories-meta/user2/repo-release.git/info/exclude
new file mode 100644
index 0000000000..a5196d1be8
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/info/exclude
@@ -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]
+# *~
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/08/9ba8b2f324d89b74f6853374a0476b312a46f6 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/08/9ba8b2f324d89b74f6853374a0476b312a46f6
new file mode 100644
index 0000000000000000000000000000000000000000..20e0ea813f24fee036dabaff3528566df689e6fb
GIT binary patch
literal 54
zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bx2y%6F@paY9O<~CW=drNo(Qo(5%j1NPuQvT@
M%3f*;086+KtY)JbbN~PV
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/18/4288e5acffbcb17160b990e8efe83b12dfaaba b/tests/gitea-repositories-meta/user2/repo-release.git/objects/18/4288e5acffbcb17160b990e8efe83b12dfaaba
new file mode 100644
index 0000000000000000000000000000000000000000..7c12e34ae915dc7bac74be53dfdd590d036da387
GIT binary patch
literal 127
zcmV-_0D%8^0gcVg3PK?ehT+y;#q5J{{5dK_bStCIp&&8T16_WzY2WsP_xVb1?YRKA
za9V>I_GH--5_;qJ>~lhGbfvhla}jlkflLj#C_2`o4>%?dge%oLcuu_YhuZtam(tr!
h)QG{lkPMuK(Mnc%Tl`;_@YgBvVKCLk>I>hPHFF4lLJR-^
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/24/3cdd85d09ce4104855edf219c05b74c65350fc b/tests/gitea-repositories-meta/user2/repo-release.git/objects/24/3cdd85d09ce4104855edf219c05b74c65350fc
new file mode 100644
index 0000000000000000000000000000000000000000..c4552eed42307fdd4f4f0c7d4c382dc56a476627
GIT binary patch
literal 85
zcmV-b0IL6Z0V^p=O;s>AWH2-^Ff%bx2y%6F@paY9O<|~Ejr*A1&Ah{K_w${nqTU*B
rTybv!R8dlCdRk@$!?U@MW^cN9&DpzKb6t7VjYCg*f+qq1a?>F-GI=Iw
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/43/80f99290b2b3922733ff82c57afad915ace907 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/43/80f99290b2b3922733ff82c57afad915ace907
new file mode 100644
index 0000000000000000000000000000000000000000..48690be455c4387bb0360aa9db6405595893db18
GIT binary patch
literal 158
zcmV;P0Ac@l0gaAJ3c@fDKwak)*$a}HOg;q>uQEwzP%u`~R6M?2cmTJL_u$o~wfnFL
z;V`<0&5nzR`c$V_awysJ1W|+H6x5N@?01FGytvDASk9cBlUyTFP1zU58YK~ylA-7X
zf<#5t@HTEsx7#Wm?3w4e%eul<KHOdpIn||IEW`}S2S~vl9Xe-ry59}?uS29?XH<A>
MUF;jp7Xn*DgM2|t?*IS*
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/6d/fe48a18ce2fb47d3a75e13c7ab35f935077535 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/6d/fe48a18ce2fb47d3a75e13c7ab35f935077535
new file mode 100644
index 0000000000000000000000000000000000000000..53437069b039400babc22932d388bdeebd09738e
GIT binary patch
literal 50
zcmb<m^geacKghr=F(8b?>#V1*j-PIrhNrGxpoW+3iRX{F&g+~E@CeZ`zGD1<i9sry
GXA1zneG!xZ
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/71/97b56fdc75b453f47c9110938cb46a303579fd b/tests/gitea-repositories-meta/user2/repo-release.git/objects/71/97b56fdc75b453f47c9110938cb46a303579fd
new file mode 100644
index 0000000000000000000000000000000000000000..f62b08d916867e7a2b183eb25837ee4863de277d
GIT binary patch
literal 153
zcmV;K0A~Mq0hNwh3IZ_<0R8SM`Y%Y*XI4bKO53C;Sa<1G@%Z)%{tW{IQ`XiVLmTvm
z(M5FOSPcng2hPSQiL(HEXROPK0uosXiv_i%F0Y~EQWqwwn87;^9x4$h$P-Bn)|jEx
zAVsD3xUXHmcj>4viMh+Z<4wM)ZBIFswOus^!f3tqP9MPlsA=cjkbgVX=XjH|{uuQG
H-%&#wmmf#Q
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/79/f9d88f1b054d650f88da0bd658e21f7b0cf6ec b/tests/gitea-repositories-meta/user2/repo-release.git/objects/79/f9d88f1b054d650f88da0bd658e21f7b0cf6ec
new file mode 100644
index 0000000000000000000000000000000000000000..e1fd864352904dd353be0a681644832f8cf6f233
GIT binary patch
literal 156
zcmV;N0Av4n0gaA93c@fD06pgwxeKzpNlX?*{K_WTs9<eLQ}Frr-~+r4GcaYIrsuGP
zco<#PYI7xd)*5^!${AY#sKS_I;^LuXU<_5vB3<9ZdY7Ov6GNu#m?%2eTA~u7G^x8Q
zMH!-zZ9L{~w^cjZi`3e6UGb(LnU<HH$~;{yo)bnF&^dbq0x&z>?}q-@5&2(d@^){}
KkNE<*_d(ze*h?A!
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/7c/055ef1678b03b831bbe7b9ca5aed33b1a8dea0 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/7c/055ef1678b03b831bbe7b9ca5aed33b1a8dea0
new file mode 100644
index 0000000000000000000000000000000000000000..5ed6e57cb007aa5a07645c51f79cc34a73b3c93f
GIT binary patch
literal 53
zcmb<m^geacKghr^DIko)>#V1*j-PIrhNrGxpoW+3iRX{F&g+~E@CeZ`zG8f#@j_b+
JLuW2u8vp?P6bb+U
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/80/abeef37c96b85b83a916f5f295f04f4d380a42 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/80/abeef37c96b85b83a916f5f295f04f4d380a42
new file mode 100644
index 0000000000000000000000000000000000000000..f1c547f124f6bdae223513adae8db5ad55ff138f
GIT binary patch
literal 85
zcmV-b0IL6Z0V^p=O;s>AVlXr?Ff%bx2y%6F@paY9O<~CW=drNo(Qo(5%j1NPuQvT@
r%3f*;Rg{*RSW;S)%J6LNquHA-UUT;D)?8N}b>q;Jp5Tc9iu)k$xkxN*
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/a8/a700e8c644c783ba2c6e742bb81bf91e244bff b/tests/gitea-repositories-meta/user2/repo-release.git/objects/a8/a700e8c644c783ba2c6e742bb81bf91e244bff
new file mode 100644
index 0000000000000000000000000000000000000000..06e5d2468bebdeb70bacff7f58986f28a5469aee
GIT binary patch
literal 153
zcmV;K0A~Mq0hNwH3c@fD06pgwxeKzJjp;^2{K_WTpkQoCQ}Oxs3*Lr-fyr}g&tV;&
z52LGE;FyGytK@vydGa;znP~C?ehP`ui4QfHMY_I+tyD2bkQ{v!!2}guECiK^iw6#Y
zG7FQDZ9L{~w^cjZtCZ4pUGc78Y0FDbd2Tn0fpH=qnd}i9fZ6SSH}v1mbd}QdVn1kp
HDuqG%3&Bbd
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/bc/7068d1eb2f93a04e3ec73521473444ceec0961 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/bc/7068d1eb2f93a04e3ec73521473444ceec0961
new file mode 100644
index 0000000000000000000000000000000000000000..1464422f208658fc3c1c35c46dbf5dcab5039491
GIT binary patch
literal 58
zcmV-A0LA}!0ZYosPf{>3Wl&ZKO3g`4EKV&}C`m0YQ7B3+$mik;&n(GMNK_~@)H6^>
Q%u4|=jr0t-0K4W7uwoMy1^@s6
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/c4/a4e1a72a2098d687b4280e7c6972280c1f9c39 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/c4/a4e1a72a2098d687b4280e7c6972280c1f9c39
new file mode 100644
index 0000000000000000000000000000000000000000..27c3726b159f27f088fdf6e11b8603836c792a5f
GIT binary patch
literal 166
zcmV;X09pTd0gcX03c@fDKw;N8MV5*nnaOWK#H&n_i5875X$n2QU3dVu4?cKls&(uV
z(HweXmf1MaC1lD_$N?L$17dL;wMJvK4JA>qS<KY<(<KG+N^wZenB;?wgvqft7-N7~
z2H;)AQUtC2IW@U1+(2F_=f=wdciyPZZ@#3d-XypHUR%&wo)s!3_PXD7{?DOzKPTe)
UDB~uNk<x3PTIYNcUt=;x*gL0AYybcN
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/cd/7f28e1b404377eadbe0d54234ba861883e6930 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/cd/7f28e1b404377eadbe0d54234ba861883e6930
new file mode 100644
index 0000000000000000000000000000000000000000..05712c8734a4c6009a64c9b4d9acf3340ba3b58e
GIT binary patch
literal 96
zcmV-m0H6PO0V^p=O;s>7Fk>(@FfcPQQ3!H%bn$i7%S~a}Q;>1-wf^J<es;%A72Qo-
z&b{GGgepoZO;5|LV0bq7(d<nZuQ_{nYpyGgx^d`9Pw+&jinP?klG377tV#fg;xEC*
C3@u~;
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/ce/f06e48f2642cd0dc9597b4bea09f4b3f74aad6 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/ce/f06e48f2642cd0dc9597b4bea09f4b3f74aad6
new file mode 100644
index 0000000000000000000000000000000000000000..5d5a01d4dfeeac6c56d8b23c8e111334ded82141
GIT binary patch
literal 159
zcmV;Q0AT-k0gaAJ3IZ_@1zqP9*$YE==Px2&C3bpHFwT(4h{rbz58$qNP><rJ)<@Tb
z;n16iCTqBq=n5nji(sR3Qf9)$;BLXPcgDfYYRyevU9-(rFbB#6DHb2Y%~Avj>{FmY
zjB{d>RNni2X?owJp+4tQnrs_h<&*3Bl!=#m(dZ+FaSv7>fdJH4M_rfyJc{P$sV2Ep
NIq5e}sJ__OLU{EeO?3bO
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/d0/718fe871fbb54da104ff201f75f62a6ced2e29 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/d0/718fe871fbb54da104ff201f75f62a6ced2e29
new file mode 100644
index 0000000000000000000000000000000000000000..81ea78ca50fd2d0f1ea065bac1b9f7196b2ca4fe
GIT binary patch
literal 54
zcmb<m)YkO!4K*-JH!v|UFg6V2C@L-aSbFueZ{iN=ON#gElU^E%HlN+kdqi}NdYFGK
KFN1{-|4sl0;1liu
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/d4/613f8dad1fa61e415922f6eb33244358fca85d b/tests/gitea-repositories-meta/user2/repo-release.git/objects/d4/613f8dad1fa61e415922f6eb33244358fca85d
new file mode 100644
index 0000000000000000000000000000000000000000..07fdeac91d3df1ed1bbd59378b72eb5219509db2
GIT binary patch
literal 84
zcmV-a0IUCa0V^p=O;s>AWH2-^Ff%bx2y%6F@paY9O<~CW=drNo(Qo(5%j1NPuQvT@
q%3f*;Rg_eko|aj`@NDj**_$q2bN24mTvr}-<It0y;E4cjZ6Jn{oht<Z
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/dd/5488178fc8a5c62430b3fb3017203b917b95ab b/tests/gitea-repositories-meta/user2/repo-release.git/objects/dd/5488178fc8a5c62430b3fb3017203b917b95ab
new file mode 100644
index 0000000000000000000000000000000000000000..da443706e8e0f73ddb6e5fd3424e0bccefc375aa
GIT binary patch
literal 38
ucmb<m^geacKghr+DIko)>#V1*j-PIrhNrGxpoW+3iRX`)82VpxrUC%`z70$O
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644
index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc
GIT binary patch
literal 15
Wcmb<m^geacKgb|~fq`=a;|BmLO$9Rm
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/ef/3c849ed54b22bb1f500da91b789c40cb0915da b/tests/gitea-repositories-meta/user2/repo-release.git/objects/ef/3c849ed54b22bb1f500da91b789c40cb0915da
new file mode 100644
index 0000000000000000000000000000000000000000..c04c066de7fa05f197afbfcdad174cd3c8de8c79
GIT binary patch
literal 97
zcmV-n0G|JN0V^p=O;s>7Fk>(@FfcPQQ3!H%bn$i7%S~a({pYc;=h1KX%gf`0kFPfU
zY06$|3RRR;nx2+f!SHPEquHA-UUT;D)?8N}b>q;Jp5Td46=|u7C8b5FSd{<(?cy-_
D&uTGE
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/f3/f1c90ac949aa1b0f129d30f338d408663c8a83 b/tests/gitea-repositories-meta/user2/repo-release.git/objects/f3/f1c90ac949aa1b0f129d30f338d408663c8a83
new file mode 100644
index 0000000000..b364558975
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/objects/f3/f1c90ac949aa1b0f129d30f338d408663c8a83
@@ -0,0 +1,2 @@
+x��A
+� ��� �o��RJ����i 6���+t;0��ֹkK���� 1��4��d��5$ao�g ;��>]St6F��ERNț4MgeHd�0'V|�������~p)
�N/|�n ny�OM>R��G}5�u���_O5p���>��R�E�
\ No newline at end of file
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/objects/f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc b/tests/gitea-repositories-meta/user2/repo-release.git/objects/f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc
new file mode 100644
index 0000000000000000000000000000000000000000..91fccd447fe1ae44bda5ac217479c40ea5879984
GIT binary patch
literal 54
zcmb<m)YkO!4K*-JH!v|UFg6V2C@L-aSbFueZ(@bn_ls|Q#n)R_muIij?%!4T!qfkQ
K3q$BJA$tHE6BX3}
literal 0
HcmV?d00001
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/main b/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/main
new file mode 100644
index 0000000000..e2b25a9e80
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/main
@@ -0,0 +1 @@
+7197b56fdc75b453f47c9110938cb46a303579fd
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/master b/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/master
new file mode 100644
index 0000000000..3329878fa1
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/refs/heads/master
@@ -0,0 +1 @@
+a8a700e8c644c783ba2c6e742bb81bf91e244bff
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.0 b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.0
new file mode 100644
index 0000000000..3329878fa1
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.0
@@ -0,0 +1 @@
+a8a700e8c644c783ba2c6e742bb81bf91e244bff
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.1 b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.1
new file mode 100644
index 0000000000..d0def6a0bc
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v1.1
@@ -0,0 +1 @@
+cef06e48f2642cd0dc9597b4bea09f4b3f74aad6
diff --git a/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v2.0 b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v2.0
new file mode 100644
index 0000000000..e2b25a9e80
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/repo-release.git/refs/tags/v2.0
@@ -0,0 +1 @@
+7197b56fdc75b453f47c9110938cb46a303579fd
diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go
index 76ceb779e0..b3a184eddd 100644
--- a/tests/integration/api_repo_test.go
+++ b/tests/integration/api_repo_test.go
@@ -82,9 +82,9 @@ func TestAPISearchRepo(t *testing.T) {
}{
{
name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
- nil: {count: 31},
- user: {count: 31},
- user2: {count: 31},
+ nil: {count: 32},
+ user: {count: 32},
+ user2: {count: 32},
},
},
{
diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go
index 9f971d4c85..8e3f96c93b 100644
--- a/tests/integration/release_test.go
+++ b/tests/integration/release_test.go
@@ -134,7 +134,7 @@ func TestCreateReleasePaging(t *testing.T) {
func TestViewReleaseListNoLogin(t *testing.T) {
defer tests.PrepareTestEnv(t)()
- repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 57, OwnerName: "user2", LowerName: "repo-release"})
link := repo.Link() + "/releases"
@@ -143,18 +143,43 @@ func TestViewReleaseListNoLogin(t *testing.T) {
htmlDoc := NewHTMLParser(t, rsp.Body)
releases := htmlDoc.Find("#release-list li.ui.grid")
- assert.Equal(t, 2, releases.Length())
+ assert.Equal(t, 3, releases.Length())
- links := make([]string, 0, 5)
+ links := make([]string, 0, 3)
+ commitsToMain := make([]string, 0, 3)
releases.Each(func(i int, s *goquery.Selection) {
link, exist := s.Find(".release-list-title a").Attr("href")
if !exist {
return
}
links = append(links, link)
+
+ commitsToMain = append(commitsToMain, s.Find(".ahead > a").Text())
})
- assert.EqualValues(t, []string{"/user2/repo1/releases/tag/v1.0", "/user2/repo1/releases/tag/v1.1"}, links)
+ assert.EqualValues(t, []string{
+ "/user2/repo-release/releases/tag/v2.0",
+ "/user2/repo-release/releases/tag/v1.1",
+ "/user2/repo-release/releases/tag/v1.0",
+ }, links)
+ assert.EqualValues(t, []string{
+ "0 commits",
+ "1 commits", // should be 3 commits ahead and 2 commits behind, but not implemented yet
+ "3 commits",
+ }, commitsToMain)
+}
+
+func TestViewSingleReleaseNoLogin(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ req := NewRequest(t, "GET", "/user2/repo-release/releases/tag/v1.0")
+ resp := MakeRequest(t, req, http.StatusOK)
+
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ // check the "number of commits to main since this release"
+ releaseList := htmlDoc.doc.Find("#release-list .ahead > a")
+ assert.EqualValues(t, 1, releaseList.Length())
+ assert.EqualValues(t, "3 commits", releaseList.First().Text())
}
func TestViewReleaseListLogin(t *testing.T) {