git/remote.c, branch v2.11.2

Merge branch 'km/branch-get-push-while-detached' into maint

2017-01-31T21:32:08Z

"git @{push}" on a detached HEAD used to segfault; it has been corrected to error out with a message. * km/branch-get-push-while-detached: branch_get_push: do not segfault when HEAD is detached

branch_get_push: do not segfault when HEAD is detached

2017-01-08T03:20:07Z

Move the detached HEAD check from branch_get_push_1() to branch_get_push() to avoid setting branch->push_tracking_ref when branch is NULL. Signed-off-by: Kyle Meyer Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

use strbuf_addstr() for adding constant strings to a strbuf, part 2

2016-09-15T19:23:38Z

Replace uses of strbuf_addf() for adding strings with more lightweight strbuf_addstr() calls. This makes the intent clearer and avoids potential issues with printf format specifiers. 02962d36845b89145cd69f8bc65e015d78ae3434 already converted six cases, this patch covers eleven more. A semantic patch for Coccinelle is included for easier checking for new cases that might be introduced in the future. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'jk/push-force-with-lease-creation' into maint

2016-09-09T04:35:53Z

"git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting

push: allow pushing new branches with --force-with-lease

2016-07-26T20:48:28Z

If there is no upstream information for a branch, it is likely that it is newly created and can safely be pushed under the normal fast-forward rules. Relax the --force-with-lease check so that we do not reject these branches immediately but rather attempt to push them as new branches, using the null SHA-1 as the expected value. In fact, it is already possible to push new branches using the explicit --force-with-lease=: syntax, so all we do here is make this behaviour the default if no explicit "expect" value is specified. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

push: add shorthand for --force-with-lease branch creation

2016-07-26T20:48:09Z

Allow the empty string to stand in for the null SHA-1 when pushing a new branch, like we do when deleting branches. This means that the following command ensures that `new-branch` is created on the remote (that is, is must not already exist): git push --force-with-lease=new-branch: origin new-branch Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'nd/remote-plural-ours-plus-theirs' into maint

2016-05-26T20:17:18Z

Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message

Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD

2016-05-18T21:40:12Z

Code fixup. * jk/fix-attribute-macro-in-2.5: remote.c: spell __attribute__ correctly

Merge branch 'nd/remote-plural-ours-plus-theirs'

2016-05-17T21:38:24Z

Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message

remote.c: specify correct plural form in "commit diverge" message

2016-05-06T19:52:58Z

We need to count both "ours" and "theirs" commits when selecting plural form for this message. Note that even though in this block, both ours and theirs must be positive (i.e. can't be in singular form), we still keep Q_(singular, plural) because languages other than English may have more than one plural form. Reported-by: Alfonsogonzalez, Ernesto (GE Digital) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano