diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-22 04:24:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-24 22:37:17 (GMT) |
| commit | 5ece083fc7ffd60d38b9abf7797fbf00decd2bcc (patch) | |
| tree | 720da8792593369e955915f28078ca4182df18c6 /transport.c | |
| parent | 256b9d70a497534338f0c22101cb6566ab3f1665 (diff) | |
| download | git-5ece083fc7ffd60d38b9abf7797fbf00decd2bcc.zip git-5ece083fc7ffd60d38b9abf7797fbf00decd2bcc.tar.gz git-5ece083fc7ffd60d38b9abf7797fbf00decd2bcc.tar.bz2 | |
push: further clean up fields of "struct ref"
The "nonfastforward" and "update" fields are only used while
deciding what value to assign to the "status" locally in a single
function. Remove them from the "struct ref".
The "requires_force" field is not used to decide if the proposed
update requires a --force option to succeed, or to record such a
decision made elsewhere. It is used by status reporting code that
the particular update was "forced". Rename it to "forced_update",
and move the code to assign to it around to further clarify how it
is used and what it is used for.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 2673d27..585ebcd 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->requires_force) { + if (ref->forced_update) { strcat(quickref, "..."); type = '+'; msg = "forced update"; |