diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-19 08:18:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 08:18:51 +0200 |
| commit | ca306985d35f295fb2a2f8a54661731462426281 (patch) | |
| tree | c63ec4474aecd21a39fd0b7aeac34df602f92311 /vendor | |
| parent | b0d5bb909b2e558bee5d4d58f201012d5f8b4c1c (diff) | |
| download | gitea-ca306985d35f295fb2a2f8a54661731462426281.tar.gz gitea-ca306985d35f295fb2a2f8a54661731462426281.zip | |
Change how merged PR commit info are prepared (#3368)
* Change how merged PR commits and diff are made
* Update code.gitea.io/git dependency
* Fix typo
* Remove unneeded local variable
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/code.gitea.io/git/repo_commit.go | 8 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vendor/code.gitea.io/git/repo_commit.go b/vendor/code.gitea.io/git/repo_commit.go index 44ad8450fd..56bebd7a3a 100644 --- a/vendor/code.gitea.io/git/repo_commit.go +++ b/vendor/code.gitea.io/git/repo_commit.go @@ -11,8 +11,8 @@ import ( "strings" ) -// getRefCommitID returns the last commit ID string of given reference (branch or tag). -func (repo *Repository) getRefCommitID(name string) (string, error) { +// GetRefCommitID returns the last commit ID string of given reference (branch or tag). +func (repo *Repository) GetRefCommitID(name string) (string, error) { stdout, err := NewCommand("show-ref", "--verify", name).RunInDir(repo.Path) if err != nil { if strings.Contains(err.Error(), "not a valid ref") { @@ -25,12 +25,12 @@ func (repo *Repository) getRefCommitID(name string) (string, error) { // GetBranchCommitID returns last commit ID string of given branch. func (repo *Repository) GetBranchCommitID(name string) (string, error) { - return repo.getRefCommitID(BranchPrefix + name) + return repo.GetRefCommitID(BranchPrefix + name) } // GetTagCommitID returns last commit ID string of given tag. func (repo *Repository) GetTagCommitID(name string) (string, error) { - return repo.getRefCommitID(TagPrefix + name) + return repo.GetRefCommitID(TagPrefix + name) } // parseCommitData parses commit information from the (uncompressed) raw diff --git a/vendor/vendor.json b/vendor/vendor.json index 51f758fd2f..e008169262 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test appengine", "package": [ { - "checksumSHA1": "1WHdGmDRsFRTD5N69l+MEbZr+nM=", + "checksumSHA1": "Gz+a5Qo4PCiB/Gf2f02v8HEAxDM=", "path": "code.gitea.io/git", - "revision": "f4a91053671bee69f1995e456c1541668717c19d", - "revisionTime": "2018-01-07T06:11:05Z" + "revision": "6798d0f202cdc7187c00a467b586a4bdee27e8c9", + "revisionTime": "2018-01-14T14:37:32Z" }, { "checksumSHA1": "Qtq0kW+BnpYMOriaoCjMa86WGG8=", |