diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-03-27 02:31:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-26 19:31:21 +0100 |
| commit | 0df81b9e0d124894d6920a0f0419c13eb4ce9240 (patch) | |
| tree | 754fd751e11fed85c752fc99ef559d7bc29f0b8a /modules/git/repo_compare.go | |
| parent | d5f9a4ef448f054285c40b6785ed1afe0d2b1854 (diff) | |
| download | gitea-0df81b9e0d124894d6920a0f0419c13eb4ce9240.tar.gz gitea-0df81b9e0d124894d6920a0f0419c13eb4ce9240.zip | |
Add git dashes separator to some "log" and "diff" commands (#23606)
Reference:
https://github.com/go-gitea/gitea/issues/22578#issuecomment-1444180053
Credits to @tdesveaux , thank you very much for catching the problem. If
you'd like to open a PR, feel free to replace this one.
Git reports fatal errors for ambiguous arguments:
```
fatal: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
```
So the `--` separator is necessary in some cases.
Diffstat (limited to 'modules/git/repo_compare.go')
| -rw-r--r-- | modules/git/repo_compare.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index 439455e3c2..e706275856 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -92,8 +92,11 @@ func (repo *Repository) GetCompareInfo(basePath, baseBranch, headBranch string, // We have a common base - therefore we know that ... should work if !fileOnly { + // avoid: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree. Use '--': 'git <command> [<revision>...] -- [<file>...]' var logs []byte - logs, _, err = NewCommand(repo.Ctx, "log").AddDynamicArguments(baseCommitID + separator + headBranch).AddArguments(prettyLogFormat).RunStdBytes(&RunOpts{Dir: repo.Path}) + logs, _, err = NewCommand(repo.Ctx, "log").AddArguments(prettyLogFormat). + AddDynamicArguments(baseCommitID + separator + headBranch).AddArguments("--"). + RunStdBytes(&RunOpts{Dir: repo.Path}) if err != nil { return nil, err } @@ -146,7 +149,8 @@ func (repo *Repository) GetDiffNumChangedFiles(base, head string, directComparis separator = ".." } - if err := NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base + separator + head). + // avoid: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree. Use '--': 'git <command> [<revision>...] -- [<file>...]' + if err := NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base + separator + head).AddArguments("--"). Run(&RunOpts{ Dir: repo.Path, Stdout: w, @@ -157,7 +161,7 @@ func (repo *Repository) GetDiffNumChangedFiles(base, head string, directComparis // previously it would return the results of git diff -z --name-only base head so let's try that... w = &lineCountWriter{} stderr.Reset() - if err = NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base, head).Run(&RunOpts{ + if err = NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base, head).AddArguments("--").Run(&RunOpts{ Dir: repo.Path, Stdout: w, Stderr: stderr, |