aboutsummaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-11-29 19:41:36 -0600
committerJunio C Hamano <gitster@pobox.com>2012-12-02 01:44:15 -0800
commit8c5f6f717d136c5a0e9d6d3879bf2a7bdeb42154 (patch)
tree5679d8837348f4687f5b923933068ec98c7a10ba /transport.c
parentffe81ef2ac5bcf83b9ab792e4d05ec95744a2fb6 (diff)
downloadgit-8c5f6f717d136c5a0e9d6d3879bf2a7bdeb42154.tar.gz
git-8c5f6f717d136c5a0e9d6d3879bf2a7bdeb42154.tar.xz
push: flag updates that require force
Add a flag for indicating an update to a reference requires force. Currently the `nonfastforward` flag is used for this when generating the status message. A separate flag insulates dependent logic from the details of set_ref_status_for_push(). Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c
index bc31e8e66..f3160b142 100644
--- a/transport.c
+++ b/transport.c
@@ -659,7 +659,7 @@ static void print_ok_ref_status(struct ref *ref, int porcelain)
const char *msg;
strcpy(quickref, status_abbrev(ref->old_sha1));
- if (ref->nonfastforward) {
+ if (ref->requires_force) {
strcat(quickref, "...");
type = '+';
msg = "forced update";