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

push: don't mark options of recurse-submodules for translation

2015-12-22T22:40:47Z

Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

push: follow the "last one wins" convention for --recurse-submodules

2015-12-04T21:04:04Z

Use the "last one wins" convention for --recurse-submodules rather than treating conflicting options as an error. Also, fix the declaration of the file-scope recurse_submodules global variable to put it on a separate line. Signed-off-by: Mike Crowe Signed-off-by: Junio C Hamano

push: add recurseSubmodules config option

2015-11-20T13:02:07Z

The --recurse-submodules command line parameter has existed for some time but it has no config file equivalent. Following the style of the corresponding parameter for git fetch, let's invent push.recurseSubmodules to provide a default for this parameter. This also requires the addition of --recurse-submodules=no to allow the configuration to be overridden on the command line when required. The most straightforward way to implement this appears to be to make push use code in submodule-config in a similar way to fetch. Signed-off-by: Mike Crowe Signed-off-by: Jeff King

push: add a config option push.gpgSign for default signed pushes

2015-08-19T19:58:58Z

Signed-off-by: Dave Borowitz Signed-off-by: Junio C Hamano

push: support signing pushes iff the server supports it

2015-08-19T19:58:45Z

Add a new flag --sign=true (or --sign=false), which means the same thing as the original --signed (or --no-signed). Give it a third value --sign=if-asked to tell push and send-pack to send a push certificate if and only if the server advertised a push cert nonce. If not, warn the user that their push may not be as secure as they thought. Signed-off-by: Dave Borowitz Signed-off-by: Junio C Hamano

push: allow --follow-tags to be set by config push.followTags

2015-03-14T22:08:35Z

Signed-off-by: Dave Olszewski Helped-by: Jeff King Signed-off-by: Junio C Hamano

cmd_push: pass "flags" pointer to config callback

2015-02-17T18:49:29Z

This will let us manipulate any transport flags which have matching config options (there are none yet, but we will add one in the next patch). We could also just make "flags" a static file-scope global, but the result is a little confusing. We end up passing it along through do_push and push_with_options, each of which further munge it. Having slightly-differing versions of the flags variable available to those functions would probably cause more confusion than it is worth. Let's just keep the original local to cmd_push, and it can continue to pass it through the call-stack. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

cmd_push: set "atomic" bit directly

2015-02-17T18:49:18Z

This makes the code shorter and more obvious by removing an unnecessary interim variable. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git_push_config: drop cargo-culted wt_status pointer

2015-02-16T06:55:11Z

The push config callback does not expect any incoming data via the void pointer. And if it did, it would certainly not be a "struct wt_status". This probably got picked up accidentally in b945901 (push: heed user.signingkey for signed pushes, 2014-10-22), which copied the template for the config callback from builtin/commit.c. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'sb/atomic-push'

2015-02-11T21:43:51Z

"git push" has been taught a "--atomic" option that makes push to update more than one ref an "all-or-none" affair. * sb/atomic-push: Document receive.advertiseatomic t5543-atomic-push.sh: add basic tests for atomic pushes push.c: add an --atomic argument send-pack.c: add --atomic command line argument send-pack: rename ref_update_to_be_sent to check_to_send_update receive-pack.c: negotiate atomic push support receive-pack.c: add execute_commands_atomic function receive-pack.c: move transaction handling in a central place receive-pack.c: move iterating over all commands outside execute_commands receive-pack.c: die instead of error in case of possible future bug receive-pack.c: shorten the execute_commands loop over all commands