mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'aw/push-force-with-lease-reporting'

Browse Source 
"git push --force-with-lease" has been taught to report if the push
needed to force (or fast-forwarded).

* aw/push-force-with-lease-reporting:
  push: fix ref status reporting for --force-with-lease
This commit is contained in:
Junio C Hamano
2016-02-10 14:20:08 -08:00
parent a3764e7da7 b2e93f88cb
commit 24abb31727
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
remote.c
View File

@ -1548,11 +1548,8 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
}
/*
* Bypass the usual "must fast-forward" check but
* replace it with a weaker "the old value must be
* this value we observed". If the remote ref has
* moved and is now different from what we expect,
* reject any push.
* If the remote ref has moved and is now different
* from what we expect, reject any push.
*
* It also is an error if the user told us to check
* with the remote-tracking branch to find the value
@ -1563,10 +1560,14 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
if (ref->expect_old_no_trackback ||
oidcmp(&ref->old_oid, &ref->old_oid_expect))
reject_reason = REF_STATUS_REJECT_STALE;
else
/* If the ref isn't stale then force the update. */
force_ref_update = 1;
}
/*
* The usual "must fast-forward" rules.
* If the update isn't already rejected then check
* the usual "must fast-forward" rules.
*
* Decide whether an individual refspec A:B can be
* pushed. The push will succeed if any of the
@ -1585,7 +1586,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
* passing the --force argument
*/
else if (!ref->deletion && !is_null_oid(&ref->old_oid)) {
if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
if (starts_with(ref->name, "refs/tags/"))
reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
else if (!has_object_file(&ref->old_oid))