summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-07-26 20:44:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-26 20:48:28 (GMT)
commit64ac39af7020f3a8bc52d51137804ce9f46baf66 (patch)
tree18af053411baadf7d5e040205a4377f4689b040c /remote.h
parenteee98e74f928a49c310038c77026ebc04e6cf4b2 (diff)
downloadgit-64ac39af7020f3a8bc52d51137804ce9f46baf66.zip
git-64ac39af7020f3a8bc52d51137804ce9f46baf66.tar.gz
git-64ac39af7020f3a8bc52d51137804ce9f46baf66.tar.bz2
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 'remote.h')
-rw-r--r--remote.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/remote.h b/remote.h
index 4a039ba..9674ddb 100644
--- a/remote.h
+++ b/remote.h
@@ -87,7 +87,6 @@ struct ref {
force:1,
forced_update:1,
expect_old_sha1:1,
- expect_old_no_trackback:1,
deletion:1,
matched:1;