diff options
| author | Chris Rorvick <chris@rorvick.com> | 2012-11-29 19:41:36 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-02 01:44:15 -0800 |
| commit | 8c5f6f717d136c5a0e9d6d3879bf2a7bdeb42154 (patch) | |
| tree | 5679d8837348f4687f5b923933068ec98c7a10ba /cache.h | |
| parent | ffe81ef2ac5bcf83b9ab792e4d05ec95744a2fb6 (diff) | |
| download | git-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 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -999,7 +999,9 @@ struct ref { unsigned char old_sha1[20]; unsigned char new_sha1[20]; char *symref; - unsigned int force:1, + unsigned int + force:1, + requires_force:1, merge:1, nonfastforward:1, not_forwardable:1, |