git/builtin/push.c, branch gitk-resize-error

i18n: turn "options are incompatible" into "cannot be used together"

2022-01-05T21:29:23Z

Signed-off-by: Jean-Noël Avila Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

advice: remove read uses of most global `advice_` variables

2021-08-25T19:07:52Z

In c4a09cc9ccb (Merge branch 'hw/advise-ng', 2020-03-25), a new API for accessing advice variables was introduced and deprecated `advice_config` in favor of a new array, `advice_setting`. This patch ports all but two uses which read the status of the global `advice_` variables over to the new `advice_enabled` API. We'll deal with advice_add_embedded_repo and advice_graft_file_deprecated separately. Signed-off-by: Ben Boeckel Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

push: don't get a full remote object

2021-06-02T01:12:03Z

All we need to know is that their names are the same. Additionally this might be easier to parse for some since remote_for_branch is more descriptive than remote_get(NULL). Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: only check same_remote when needed

2021-06-02T01:12:02Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: remove trivial function

2021-06-02T01:12:02Z

It's a single line that is used in a single place, and the variable has the same name as the function. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: remove redundant check

2021-06-02T01:12:02Z

If fetch_remote is NULL (i.e. the branch remote is invalid), then it can't possibly be same as remote, which can't be NULL. The check is redundant, and so is the extra variable. Also, fix the Yoda condition: we want to check if remote is the same as the branch remote, not the other way around. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: factor out the typical case

2021-06-02T01:12:02Z

Only override dst on the odd case. This allows a preemptive break on the `simple` case. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: get rid of all the setup_push_* functions

2021-06-02T01:12:02Z

Their code is much simpler now and can move into the parent function. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: trivial simplifications

2021-06-02T01:12:01Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

push: make setup_push_* return the dst

2021-06-02T01:12:01Z

All of the setup_push_* functions are appending a refspec. Do this only once on the parent function. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano