mirror of https://github.com/go-gitea/gitea
move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364)
* move code.gitea.io/git to code.gitea.io/gitea/modules/git * fix imports * fix fmt * fix misspell * remove wrong tests data * fix unit tests * fix tests * fix tests * fix tests * fix tests * fix tests * enable Debug to trace the failure tests * fix tests * fix tests * fix tests * fix tests * fix tests * comment commit count tests since git clone depth is 50 * fix tests * update from code.gitea.io/git * revert change to makefilepull/6410/head
Lunny Xiao
6 years ago
committed by
GitHub
parent
d056bf300f
commit
d578b71d61
@ -0,0 +1,3 @@ |
|||||||
|
# Git Module |
||||||
|
|
||||||
|
This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request. |
||||||
@ -0,0 +1,80 @@ |
|||||||
|
// Copyright 2015 The Gogs Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"bytes" |
||||||
|
"io/ioutil" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
"github.com/stretchr/testify/require" |
||||||
|
) |
||||||
|
|
||||||
|
var repoSelf = &Repository{ |
||||||
|
Path: "./", |
||||||
|
} |
||||||
|
|
||||||
|
var testBlob = &Blob{ |
||||||
|
repo: repoSelf, |
||||||
|
TreeEntry: &TreeEntry{ |
||||||
|
ID: MustIDFromString("a8d4b49dd073a4a38a7e58385eeff7cc52568697"), |
||||||
|
ptree: &Tree{ |
||||||
|
repo: repoSelf, |
||||||
|
}, |
||||||
|
}, |
||||||
|
} |
||||||
|
|
||||||
|
func TestBlob_Data(t *testing.T) { |
||||||
|
output := `Copyright (c) 2016 The Gitea Authors |
||||||
|
Copyright (c) 2015 The Gogs Authors |
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||||
|
of this software and associated documentation files (the "Software"), to deal |
||||||
|
in the Software without restriction, including without limitation the rights |
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||||
|
copies of the Software, and to permit persons to whom the Software is |
||||||
|
furnished to do so, subject to the following conditions: |
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in |
||||||
|
all copies or substantial portions of the Software. |
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||||
|
THE SOFTWARE. |
||||||
|
` |
||||||
|
|
||||||
|
r, err := testBlob.Data() |
||||||
|
assert.NoError(t, err) |
||||||
|
require.NotNil(t, r) |
||||||
|
|
||||||
|
data, err := ioutil.ReadAll(r) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, output, string(data)) |
||||||
|
} |
||||||
|
|
||||||
|
func Benchmark_Blob_Data(b *testing.B) { |
||||||
|
for i := 0; i < b.N; i++ { |
||||||
|
r, err := testBlob.Data() |
||||||
|
if err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
ioutil.ReadAll(r) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func Benchmark_Blob_DataPipeline(b *testing.B) { |
||||||
|
stdout := new(bytes.Buffer) |
||||||
|
for i := 0; i < b.N; i++ { |
||||||
|
stdout.Reset() |
||||||
|
if err := testBlob.DataPipeline(stdout, nil); err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,41 @@ |
|||||||
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
// +build race
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"context" |
||||||
|
"testing" |
||||||
|
"time" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRunInDirTimeoutPipelineNoTimeout(t *testing.T) { |
||||||
|
|
||||||
|
maxLoops := 1000 |
||||||
|
|
||||||
|
// 'git --version' does not block so it must be finished before the timeout triggered.
|
||||||
|
cmd := NewCommand("--version") |
||||||
|
for i := 0; i < maxLoops; i++ { |
||||||
|
if err := cmd.RunInDirTimeoutPipeline(-1, "", nil, nil); err != nil { |
||||||
|
t.Fatal(err) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func TestRunInDirTimeoutPipelineAlwaysTimeout(t *testing.T) { |
||||||
|
|
||||||
|
maxLoops := 1000 |
||||||
|
|
||||||
|
// 'git hash-object --stdin' blocks on stdin so we can have the timeout triggered.
|
||||||
|
cmd := NewCommand("hash-object --stdin") |
||||||
|
for i := 0; i < maxLoops; i++ { |
||||||
|
if err := cmd.RunInDirTimeoutPipeline(1*time.Microsecond, "", nil, nil); err != nil { |
||||||
|
if err != context.DeadlineExceeded { |
||||||
|
t.Fatalf("Testing %d/%d: %v", i, maxLoops, err) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,117 @@ |
|||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"os" |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
"time" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
const testReposDir = "tests/repos/" |
||||||
|
const benchmarkReposDir = "benchmark/repos/" |
||||||
|
|
||||||
|
func cloneRepo(url, dir, name string) (string, error) { |
||||||
|
repoDir := filepath.Join(dir, name) |
||||||
|
if _, err := os.Stat(repoDir); err == nil { |
||||||
|
return repoDir, nil |
||||||
|
} |
||||||
|
return repoDir, Clone(url, repoDir, CloneRepoOptions{ |
||||||
|
Mirror: false, |
||||||
|
Bare: false, |
||||||
|
Quiet: true, |
||||||
|
Timeout: 5 * time.Minute, |
||||||
|
}) |
||||||
|
} |
||||||
|
|
||||||
|
func testGetCommitsInfo(t *testing.T, repo1 *Repository) { |
||||||
|
// these test case are specific to the repo1 test repo
|
||||||
|
testCases := []struct { |
||||||
|
CommitID string |
||||||
|
Path string |
||||||
|
ExpectedIDs map[string]string |
||||||
|
}{ |
||||||
|
{"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", "", map[string]string{ |
||||||
|
"file1.txt": "95bb4d39648ee7e325106df01a621c530863a653", |
||||||
|
"file2.txt": "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", |
||||||
|
}}, |
||||||
|
{"2839944139e0de9737a044f78b0e4b40d989a9e3", "", map[string]string{ |
||||||
|
"file1.txt": "2839944139e0de9737a044f78b0e4b40d989a9e3", |
||||||
|
"branch1.txt": "9c9aef8dd84e02bc7ec12641deb4c930a7c30185", |
||||||
|
}}, |
||||||
|
{"5c80b0245c1c6f8343fa418ec374b13b5d4ee658", "branch2", map[string]string{ |
||||||
|
"branch2.txt": "5c80b0245c1c6f8343fa418ec374b13b5d4ee658", |
||||||
|
}}, |
||||||
|
} |
||||||
|
for _, testCase := range testCases { |
||||||
|
commit, err := repo1.GetCommit(testCase.CommitID) |
||||||
|
assert.NoError(t, err) |
||||||
|
tree, err := commit.Tree.SubTree(testCase.Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
entries, err := tree.ListEntries() |
||||||
|
assert.NoError(t, err) |
||||||
|
commitsInfo, err := entries.GetCommitsInfo(commit, testCase.Path, nil) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Len(t, commitsInfo, len(testCase.ExpectedIDs)) |
||||||
|
for _, commitInfo := range commitsInfo { |
||||||
|
entry := commitInfo[0].(*TreeEntry) |
||||||
|
commit := commitInfo[1].(*Commit) |
||||||
|
expectedID, ok := testCase.ExpectedIDs[entry.Name()] |
||||||
|
if !assert.True(t, ok) { |
||||||
|
continue |
||||||
|
} |
||||||
|
assert.Equal(t, expectedID, commit.ID.String()) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func TestEntries_GetCommitsInfo(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
testGetCommitsInfo(t, bareRepo1) |
||||||
|
|
||||||
|
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestEntries_GetCommitsInfo") |
||||||
|
assert.NoError(t, err) |
||||||
|
defer os.RemoveAll(clonedPath) |
||||||
|
clonedRepo1, err := OpenRepository(clonedPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
testGetCommitsInfo(t, clonedRepo1) |
||||||
|
} |
||||||
|
|
||||||
|
func BenchmarkEntries_GetCommitsInfo(b *testing.B) { |
||||||
|
benchmarks := []struct { |
||||||
|
url string |
||||||
|
name string |
||||||
|
}{ |
||||||
|
{url: "https://github.com/go-gitea/gitea.git", name: "gitea"}, |
||||||
|
{url: "https://github.com/ethantkoenig/manyfiles.git", name: "manyfiles"}, |
||||||
|
{url: "https://github.com/moby/moby.git", name: "moby"}, |
||||||
|
{url: "https://github.com/golang/go.git", name: "go"}, |
||||||
|
{url: "https://github.com/torvalds/linux.git", name: "linux"}, |
||||||
|
} |
||||||
|
for _, benchmark := range benchmarks { |
||||||
|
var commit *Commit |
||||||
|
var entries Entries |
||||||
|
if repoPath, err := cloneRepo(benchmark.url, benchmarkReposDir, benchmark.name); err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} else if repo, err := OpenRepository(repoPath); err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} else if commit, err = repo.GetBranchCommit("master"); err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} else if entries, err = commit.Tree.ListEntries(); err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
entries.Sort() |
||||||
|
b.ResetTimer() |
||||||
|
b.Run(benchmark.name, func(b *testing.B) { |
||||||
|
for i := 0; i < b.N; i++ { |
||||||
|
_, err := entries.GetCommitsInfo(commit, "", nil) |
||||||
|
if err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
} |
||||||
|
}) |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,38 @@ |
|||||||
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestCommitsCount(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
|
||||||
|
commitsCount, err := CommitsCount(bareRepo1Path, "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0") |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, int64(3), commitsCount) |
||||||
|
} |
||||||
|
|
||||||
|
func TestGetFullCommitID(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
|
||||||
|
id, err := GetFullCommitID(bareRepo1Path, "8006ff9a") |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0", id) |
||||||
|
} |
||||||
|
|
||||||
|
func TestGetFullCommitIDError(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
|
||||||
|
id, err := GetFullCommitID(bareRepo1Path, "unknown") |
||||||
|
assert.Empty(t, id) |
||||||
|
if assert.Error(t, err) { |
||||||
|
assert.EqualError(t, err, "object does not exist [id: unknown, rel_path: ]") |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,58 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestParseTreeEntries(t *testing.T) { |
||||||
|
testCases := []struct { |
||||||
|
Input string |
||||||
|
Expected []*TreeEntry |
||||||
|
}{ |
||||||
|
{ |
||||||
|
Input: "", |
||||||
|
Expected: []*TreeEntry{}, |
||||||
|
}, |
||||||
|
{ |
||||||
|
Input: "100644 blob 61ab7345a1a3bbc590068ccae37b8515cfc5843c\texample/file2.txt\n", |
||||||
|
Expected: []*TreeEntry{ |
||||||
|
{ |
||||||
|
mode: EntryModeBlob, |
||||||
|
Type: ObjectBlob, |
||||||
|
ID: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"), |
||||||
|
name: "example/file2.txt", |
||||||
|
}, |
||||||
|
}, |
||||||
|
}, |
||||||
|
{ |
||||||
|
Input: "120000 blob 61ab7345a1a3bbc590068ccae37b8515cfc5843c\t\"example/\\n.txt\"\n" + |
||||||
|
"040000 tree 1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8\texample\n", |
||||||
|
Expected: []*TreeEntry{ |
||||||
|
{ |
||||||
|
ID: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"), |
||||||
|
Type: ObjectBlob, |
||||||
|
mode: EntryModeSymlink, |
||||||
|
name: "example/\n.txt", |
||||||
|
}, |
||||||
|
{ |
||||||
|
ID: MustIDFromString("1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8"), |
||||||
|
Type: ObjectTree, |
||||||
|
mode: EntryModeTree, |
||||||
|
name: "example", |
||||||
|
}, |
||||||
|
}, |
||||||
|
}, |
||||||
|
} |
||||||
|
|
||||||
|
for _, testCase := range testCases { |
||||||
|
entries, err := ParseTreeEntries([]byte(testCase.Input)) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.EqualValues(t, testCase.Expected, entries) |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,66 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"fmt" |
||||||
|
"io/ioutil" |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRepository_GetBlob_Found(t *testing.T) { |
||||||
|
repoPath := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
r, err := OpenRepository(repoPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
testCases := []struct { |
||||||
|
OID string |
||||||
|
Data []byte |
||||||
|
}{ |
||||||
|
{"e2129701f1a4d54dc44f03c93bca0a2aec7c5449", []byte("file1\n")}, |
||||||
|
{"6c493ff740f9380390d5c9ddef4af18697ac9375", []byte("file2\n")}, |
||||||
|
} |
||||||
|
|
||||||
|
for _, testCase := range testCases { |
||||||
|
blob, err := r.GetBlob(testCase.OID) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
dataReader, err := blob.Data() |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
data, err := ioutil.ReadAll(dataReader) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, testCase.Data, data) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func TestRepository_GetBlob_NotExist(t *testing.T) { |
||||||
|
repoPath := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
r, err := OpenRepository(repoPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
testCase := "0000000000000000000000000000000000000000" |
||||||
|
testError := ErrNotExist{testCase, ""} |
||||||
|
|
||||||
|
blob, err := r.GetBlob(testCase) |
||||||
|
assert.Nil(t, blob) |
||||||
|
assert.EqualError(t, err, testError.Error()) |
||||||
|
} |
||||||
|
|
||||||
|
func TestRepository_GetBlob_NoId(t *testing.T) { |
||||||
|
repoPath := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
r, err := OpenRepository(repoPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
testCase := "" |
||||||
|
testError := fmt.Errorf("Length must be 40: %s", testCase) |
||||||
|
|
||||||
|
blob, err := r.GetBlob(testCase) |
||||||
|
assert.Nil(t, blob) |
||||||
|
assert.EqualError(t, err, testError.Error()) |
||||||
|
} |
||||||
@ -0,0 +1,39 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRepository_GetBranches(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
branches, err := bareRepo1.GetBranches() |
||||||
|
|
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Len(t, branches, 3) |
||||||
|
assert.ElementsMatch(t, []string{"branch1", "branch2", "master"}, branches) |
||||||
|
} |
||||||
|
|
||||||
|
func BenchmarkRepository_GetBranches(b *testing.B) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
if err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
|
||||||
|
for i := 0; i < b.N; i++ { |
||||||
|
_, err := bareRepo1.GetBranches() |
||||||
|
if err != nil { |
||||||
|
b.Fatal(err) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,59 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRepository_GetCommitBranches(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
// these test case are specific to the repo1_bare test repo
|
||||||
|
testCases := []struct { |
||||||
|
CommitID string |
||||||
|
ExpectedBranches []string |
||||||
|
}{ |
||||||
|
{"2839944139e0de9737a044f78b0e4b40d989a9e3", []string{"branch1"}}, |
||||||
|
{"5c80b0245c1c6f8343fa418ec374b13b5d4ee658", []string{"branch2"}}, |
||||||
|
{"37991dec2c8e592043f47155ce4808d4580f9123", []string{"master"}}, |
||||||
|
{"95bb4d39648ee7e325106df01a621c530863a653", []string{"branch1", "branch2"}}, |
||||||
|
{"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", []string{"branch2", "master"}}, |
||||||
|
{"master", []string{"master"}}, |
||||||
|
} |
||||||
|
for _, testCase := range testCases { |
||||||
|
commit, err := bareRepo1.GetCommit(testCase.CommitID) |
||||||
|
assert.NoError(t, err) |
||||||
|
branches, err := bareRepo1.getBranches(commit, 2) |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Equal(t, testCase.ExpectedBranches, branches) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func TestGetTagCommitWithSignature(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
commit, err := bareRepo1.GetCommit("3ad28a9149a2864384548f3d17ed7f38014c9e8a") |
||||||
|
|
||||||
|
assert.NoError(t, err) |
||||||
|
assert.NotNil(t, commit) |
||||||
|
assert.NotNil(t, commit.Signature) |
||||||
|
// test that signature is not in message
|
||||||
|
assert.Equal(t, "tag", commit.CommitMessage) |
||||||
|
} |
||||||
|
|
||||||
|
func TestGetCommitWithBadCommitID(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
commit, err := bareRepo1.GetCommit("bad_branch") |
||||||
|
assert.Nil(t, commit) |
||||||
|
assert.Error(t, err) |
||||||
|
assert.EqualError(t, err, "object does not exist [id: bad_branch, rel_path: ]") |
||||||
|
} |
||||||
@ -0,0 +1,30 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"io/ioutil" |
||||||
|
"os" |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestGetFormatPatch(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestGetFormatPatch") |
||||||
|
assert.NoError(t, err) |
||||||
|
defer os.RemoveAll(clonedPath) |
||||||
|
repo, err := OpenRepository(clonedPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
rd, err := repo.GetFormatPatch("8d92fc95^", "8d92fc95") |
||||||
|
assert.NoError(t, err) |
||||||
|
patchb, err := ioutil.ReadAll(rd) |
||||||
|
assert.NoError(t, err) |
||||||
|
patch := string(patchb) |
||||||
|
assert.Regexp(t, "^From 8d92fc95", patch) |
||||||
|
assert.Contains(t, patch, "Subject: [PATCH] Add file2.txt") |
||||||
|
} |
||||||
@ -0,0 +1,49 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRepository_GetRefs(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
refs, err := bareRepo1.GetRefs() |
||||||
|
|
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Len(t, refs, 4) |
||||||
|
|
||||||
|
expectedRefs := []string{ |
||||||
|
BranchPrefix + "branch1", |
||||||
|
BranchPrefix + "branch2", |
||||||
|
BranchPrefix + "master", |
||||||
|
TagPrefix + "test", |
||||||
|
} |
||||||
|
|
||||||
|
for _, ref := range refs { |
||||||
|
assert.Contains(t, expectedRefs, ref.Name) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
func TestRepository_GetRefsFiltered(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
refs, err := bareRepo1.GetRefsFiltered(TagPrefix) |
||||||
|
|
||||||
|
assert.NoError(t, err) |
||||||
|
if assert.Len(t, refs, 1) { |
||||||
|
assert.Equal(t, TagPrefix+"test", refs[0].Name) |
||||||
|
assert.Equal(t, "tag", refs[0].Type) |
||||||
|
assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", refs[0].Object.String()) |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,44 @@ |
|||||||
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"os" |
||||||
|
"path/filepath" |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestRepository_GetTags(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
bareRepo1, err := OpenRepository(bareRepo1Path) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
tags, err := bareRepo1.GetTagInfos() |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.Len(t, tags, 1) |
||||||
|
assert.EqualValues(t, "test", tags[0].Name) |
||||||
|
assert.EqualValues(t, "37991dec2c8e592043f47155ce4808d4580f9123", tags[0].ID.String()) |
||||||
|
assert.EqualValues(t, "commit", tags[0].Type) |
||||||
|
} |
||||||
|
|
||||||
|
func TestRepository_GetTag(t *testing.T) { |
||||||
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") |
||||||
|
|
||||||
|
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestRepository_GetTag") |
||||||
|
assert.NoError(t, err) |
||||||
|
defer os.RemoveAll(clonedPath) |
||||||
|
|
||||||
|
bareRepo1, err := OpenRepository(clonedPath) |
||||||
|
assert.NoError(t, err) |
||||||
|
|
||||||
|
tag, err := bareRepo1.GetTag("test") |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.NotNil(t, tag) |
||||||
|
assert.EqualValues(t, "test", tag.Name) |
||||||
|
assert.EqualValues(t, "37991dec2c8e592043f47155ce4808d4580f9123", tag.ID.String()) |
||||||
|
assert.EqualValues(t, "commit", tag.Type) |
||||||
|
} |
||||||
@ -0,0 +1,26 @@ |
|||||||
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"testing" |
||||||
|
"time" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestGetLatestCommitTime(t *testing.T) { |
||||||
|
lct, err := GetLatestCommitTime(".") |
||||||
|
assert.NoError(t, err) |
||||||
|
// Time is in the past
|
||||||
|
now := time.Now() |
||||||
|
assert.True(t, lct.Unix() < now.Unix(), "%d not smaller than %d", lct, now) |
||||||
|
// Time is after Mon Oct 23 03:52:09 2017 +0300
|
||||||
|
// which is the time of commit
|
||||||
|
// d47b98c44c9a6472e44ab80efe65235e11c6da2a
|
||||||
|
refTime, err := time.Parse("Mon Jan 02 15:04:05 2006 -0700", "Mon Oct 23 03:52:09 2017 +0300") |
||||||
|
assert.NoError(t, err) |
||||||
|
assert.True(t, lct.Unix() > refTime.Unix(), "%d not greater than %d", lct, refTime) |
||||||
|
} |
||||||
@ -0,0 +1,29 @@ |
|||||||
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package git |
||||||
|
|
||||||
|
import ( |
||||||
|
"testing" |
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert" |
||||||
|
) |
||||||
|
|
||||||
|
func TestGetRefURL(t *testing.T) { |
||||||
|
var kases = []struct { |
||||||
|
refURL string |
||||||
|
prefixURL string |
||||||
|
parentPath string |
||||||
|
expect string |
||||||
|
}{ |
||||||
|
{"git://github.com/user1/repo1", "/", "/", "http://github.com/user1/repo1"}, |
||||||
|
{"https://localhost/user1/repo1.git", "/", "/", "https://localhost/user1/repo1"}, |
||||||
|
{"git@github.com/user1/repo1.git", "/", "/", "git@github.com/user1/repo1"}, |
||||||
|
{"ssh://git@git.zefie.net:2222/zefie/lge_g6_kernel_scripts.git", "/", "/", "http://git.zefie.net/zefie/lge_g6_kernel_scripts"}, |
||||||
|
} |
||||||
|
|
||||||
|
for _, kase := range kases { |
||||||
|
assert.EqualValues(t, kase.expect, getRefURL(kase.refURL, kase.prefixURL, kase.parentPath)) |
||||||
|
} |
||||||
|
} |
||||||
@ -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,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,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,36 @@ |
|||||||
|
#!/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 comments out the |
||||||
|
# "Conflicts:" part of a merge commit. |
||||||
|
# |
||||||
|
# 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. |
||||||
|
|
||||||
|
case "$2,$3" in |
||||||
|
merge,) |
||||||
|
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; |
||||||
|
|
||||||
|
# ,|template,) |
||||||
|
# /usr/bin/perl -i.bak -pe ' |
||||||
|
# print "\n" . `git diff --cached --name-status -r` |
||||||
|
# if /^#/ && $first++ == 0' "$1" ;; |
||||||
|
|
||||||
|
*) ;; |
||||||
|
esac |
||||||
|
|
||||||
|
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') |
||||||
|
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" |
||||||
@ -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] |
||||||
|
# *~ |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue