diff options
author | John Keeping <john@keeping.me.uk> | 2016-07-26 21:44:45 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-26 13:48:28 -0700 |
commit | 64ac39af7020f3a8bc52d51137804ce9f46baf66 (patch) | |
tree | 18af053411baadf7d5e040205a4377f4689b040c /notes-merge.c | |
parent | push: add shorthand for --force-with-lease branch creation (diff) | |
download | tgif-64ac39af7020f3a8bc52d51137804ce9f46baf66.tar.xz |
push: allow pushing new branches with --force-with-lease
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=<branch>:<expect> syntax, so all we do here is make
this behaviour the default if no explicit "expect" value is specified.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions