git/builtin/push.c, branch v2.22.2

Merge branch 'nd/style-opening-brace'

2019-01-18T21:49:52Z

Code clean-up. * nd/style-opening-brace: style: the opening '{' of a function is in a separate line

Merge branch 'nd/the-index'

2019-01-04T21:33:33Z

More codepaths become aware of working with in-core repository instance other than the default "the_repository". * nd/the-index: (22 commits) rebase-interactive.c: remove the_repository references rerere.c: remove the_repository references pack-*.c: remove the_repository references pack-check.c: remove the_repository references notes-cache.c: remove the_repository references line-log.c: remove the_repository reference diff-lib.c: remove the_repository references delta-islands.c: remove the_repository references cache-tree.c: remove the_repository references bundle.c: remove the_repository references branch.c: remove the_repository reference bisect.c: remove the_repository reference blame.c: remove implicit dependency the_repository sequencer.c: remove implicit dependency on the_repository sequencer.c: remove implicit dependency on the_index transport.c: remove implicit dependency on the_index notes-merge.c: remove implicit dependency the_repository notes-merge.c: remove implicit dependency on the_index list-objects.c: reduce the_repository references list-objects-filter.c: remove implicit dependency on the_index ...

style: the opening '{' of a function is in a separate line

2018-12-10T06:41:09Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

push: change needlessly ambiguous example in error

2018-11-14T08:17:09Z

Change an example push added in b55e677522 ("push: introduce new push.default mode "simple"", 2012-04-24) to always mean the same thing whether the current setting happens to be "simple" or not. This error is only emitted under "simple", but message is explaining to the user that they can get two sorts of different behaviors by these two invocations. Let's use "git push HEAD" which always means push the current branch name to that remote, instead of "git push

" which will do that under "simple", but is not guaranteed to do under "upstream". Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

transport.c: remove implicit dependency on the_index

2018-11-12T05:50:05Z

note, there's still another hidden dependency related to this: even though we pass a repo to transport_push() we still use is_bare_repository() which pretty much assumes the_repository (and some other global state). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'rs/opt-updates'

2018-08-27T21:33:43Z

"git cmd -h" updates. * rs/opt-updates: parseopt: group literal string alternatives in argument help remote: improve argument help for add --mirror checkout-index: improve argument help for --stage

parseopt: group literal string alternatives in argument help

2018-08-21T18:35:54Z

This formally clarifies that the "--option=" part is the same for all alternatives. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/parse-opt-lithelp'

2018-08-17T20:09:56Z

The parse-options machinery learned to refrain from enclosing placeholder string inside a "" pair automatically without PARSE_OPT_LITERAL_ARGHELP. Existing help text for option arguments that are not formatted correctly have been identified and fixed. * rs/parse-opt-lithelp: parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP shortlog: correct option help for -w send-pack: specify --force-with-lease argument help explicitly pack-objects: specify --index-version argument help explicitly difftool: remove angular brackets from argument help add, update-index: fix --chmod argument help push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced brackets

push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced brackets

2018-08-03T15:31:28Z

The option help text for the force-with-lease option to "git push" reads like this: $ git push -h 2>&1 | grep -e force-with-lease --force-with-lease[=:] which comes from having N_("refname>:" at both ends. It turns out that parse-options machinery takes the whole string and encloses it inside a pair of "<>", to make it easier for majority cases that uses a single token placeholder. The help string was written in a funnily unbalanced way knowing that the end result would balance out, by somebody who forgot the presence of PARSE_OPT_LITERAL_ARGHELP, which is the escape hatch mechanism designed to help such a case. We just should use the official escape hatch instead. Because ":" part can be omitted to ask Git to guess, it may be more correct to spell it as "[:]", but that is not the focus of this topic. Signed-off-by: Ævar Arnfjörð Bjarmason Helped-by: René Scharfe Signed-off-by: Junio C Hamano

transport: convert transport_push to take a struct refspec

2018-05-17T21:19:44Z

Convert 'transport_push()' to take a 'struct refspec' as a parameter instead of an array of strings which represent refspecs. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano