Not sure if this is the best way, but it's the simplest way to fix#333.
Everything else is overly complex due to a chicken-egg problem:
Knowing which remote / branch to push involves requires prompting the user,
which requires to have a upstream branch pushed to detect default values.
Co-authored-by: Norwin Roosen <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/334
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: Andrew Thornton <art27@cantab.net>
Reviewed-by: khmarbaise <khmarbaise@noreply.gitea.io>
Co-authored-by: Norwin <noerw@noreply.gitea.io>
Co-committed-by: Norwin <noerw@noreply.gitea.io>
This avoids creation of local branches, to avoid cluttering the local repo:
- if the commit already exists on the tip of a local branch, check that one out
- otherwise check out the remote tracking branch (`refs/remotes/<remote>/<head>`), and suggest what to do if you want to make changes.
I'm not certain this behaviour is actually better, I suggest leaving this open for a while for people to try out the new behaviour:
```
tea pr checkout 314
make install
```
fixes#293
Co-authored-by: Norwin Roosen <git@nroo.de>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/314
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Norwin <noerw@noreply.gitea.io>
Co-committed-by: Norwin <noerw@noreply.gitea.io>
Merge branch 'master' into issue-97/pulls-clean
vendor terminal dependency
pull/push: provide authentication method
automatically select an AuthMethod according to the
remote url type. If required, credentials are prompted for
login: store username & optional keyfile
refactor
refactor GetRemote
Merge branch 'master' into issue-97/pulls-clean
adress code review
add --ignore-sha flag
When set, the local branch is not matched against the remote sha,
but the remote branch name. This makes the command more flexible
with diverging branches.
add missing error check
fix branch-not-found case
Merge branch 'master' into issue-97/pulls-clean
use directory namespaces for branches & remotes
fix TeaCreateBranch()
improve method of TeaFindBranch()
now only checking .git/refs instead of looking up .git/config which may
not list the branch
add `tea pulls clean`
fixes#97
add copyright to new files
make linter happy
refactor: use new git functions for old code
add `tea pulls checkout`
Co-authored-by: Norwin Roosen <git@nroo.de>
Co-authored-by: Norwin <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/105
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Norwin