[PATCH v3 3/5] push: flag updates
- From
Chris Rorvick <chris@rorvick.com>
- Date
- Nov 12, 2012, 04:08 UTC
- Message-ID
- <1352693288-7396-4-git-send-email-chris@rorvick.com>
- In-Reply-To
- <1352693288-7396-1-git-send-email-chris@rorvick.com>
If the reference exists on the remote and the the update is not a delete, then mark as an update. This is in preparation for handling tags and branches differently when pushing.
Signed-off-by: Chris Rorvick <chris@rorvick.com> --- cache.h | 1 + remote.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/cache.h b/cache.h index 4e25840..9712d1b 100644 --- a/cache.h +++ b/cache.h @@ -1003,6 +1003,7 @@ struct ref { merge:1, nonfastforward:1, forwardable:1, + update:1, deletion:1; enum { REF_STATUS_NONE = 0, diff --git a/remote.c b/remote.c index 5ecd58d..7fa9db6 100644 --- a/remote.c +++ b/remote.c @@ -1323,15 +1323,19 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, old->type == OBJ_COMMIT && new->type == OBJ_COMMIT); } - ref->nonfastforward = + ref->update = !ref->deletion && - !is_null_sha1(ref->old_sha1) && - (!has_sha1_file(ref->old_sha1) - || !ref_newer(ref->new_sha1, ref->old_sha1)); + !is_null_sha1(ref->old_sha1); - if (ref->nonfastforward && !ref->force && !force_update) { - ref->status = REF_STATUS_REJECT_NONFASTFORWARD; - continue; + if (ref->update) { + ref->nonfastforward = + !has_sha1_file(ref->old_sha1) + || !ref_newer(ref->new_sha1, ref->old_sha1); + + if (ref->nonfastforward && !ref->force && !force_update) { + ref->status = REF_STATUS_REJECT_NONFASTFORWARD; + continue; + } } } }
-- 1.8.0