push: fix ref status reporting for --force-with-lease
The --force--with-lease push option leads to less detailed status information than --force. In particular, the output indicates that a reference was fast-forwarded, even when it was force-updated. Modify the --force-with-lease ref status logic to leverage the --force ref status logic when the "lease" conditions are met. Also, enhance tests to validate output status reporting. Signed-off-by: Andrew Wheeler <awheeler@motorola.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrew Wheeler committed
Jan 29, 2016 at 17:18 UTC
b2e93f88cb94f487650beb93ff87ceb7ab68a0ed
2 files changed
+18
-12
remote.c
+8
-7
@@ -1545,11 +1545,8 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1545
}
1546
1547
/*
1548
- * Bypass the usual "must fast-forward" check but
1549
- * replace it with a weaker "the old value must be
1550
- * this value we observed". If the remote ref has
1551
- * moved and is now different from what we expect,
1552
- * reject any push.
1548
+ * If the remote ref has moved and is now different
1549
+ * from what we expect, reject any push.
1550
*
1551
* It also is an error if the user told us to check
1552
* with the remote-tracking branch to find the value
@@ -1560,10 +1557,14 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1557
if (ref->expect_old_no_trackback ||
1558
oidcmp(&ref->old_oid, &ref->old_oid_expect))
1559
reject_reason = REF_STATUS_REJECT_STALE;
1560
+ else
1561
+ /* If the ref isn't stale then force the update. */
1562
+ force_ref_update = 1;
1563
}
1564
1565
/*
1566
- * The usual "must fast-forward" rules.
1566
+ * If the update isn't already rejected then check
1567
+ * the usual "must fast-forward" rules.
1568
*
1569
* Decide whether an individual refspec A:B can be
1570
* pushed. The push will succeed if any of the
@@ -1582,7 +1583,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1583
* passing the --force argument
1584
*/
1585
1585
- else if (!ref->deletion && !is_null_oid(&ref->old_oid)) {
1586
+ if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1587
if (starts_with(ref->name, "refs/tags/"))
1588
reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1589
else if (!has_object_file(&ref->old_oid))
t/t5533-push-cas.sh
+10
-5
@@ -25,7 +25,8 @@ test_expect_success 'push to update (protected)' '
25
(
26
cd dst &&
27
test_commit D &&
28
- test_must_fail git push --force-with-lease=master:master origin master
28
+ test_must_fail git push --force-with-lease=master:master origin master 2>err &&
29
+ grep "stale info" err
30
) &&
31
git ls-remote . refs/heads/master >expect &&
32
git ls-remote src refs/heads/master >actual &&
@@ -37,7 +38,8 @@ test_expect_success 'push to update (protected, forced)' '
38
(
39
cd dst &&
40
test_commit D &&
40
- git push --force --force-with-lease=master:master origin master
41
+ git push --force --force-with-lease=master:master origin master 2>err &&
42
+ grep "forced update" err
43
) &&
44
git ls-remote dst refs/heads/master >expect &&
45
git ls-remote src refs/heads/master >actual &&
@@ -101,7 +103,8 @@ test_expect_success 'push to update (allowed, tracking)' '
103
(
104
cd dst &&
105
test_commit D &&
104
- git push --force-with-lease=master origin master
106
+ git push --force-with-lease=master origin master 2>err &&
107
+ ! grep "forced update" err
108
) &&
109
git ls-remote dst refs/heads/master >expect &&
110
git ls-remote src refs/heads/master >actual &&
@@ -114,7 +117,8 @@ test_expect_success 'push to update (allowed even though no-ff)' '
117
cd dst &&
118
git reset --hard HEAD^ &&
119
test_commit D &&
117
- git push --force-with-lease=master origin master
120
+ git push --force-with-lease=master origin master 2>err &&
121
+ grep "forced update" err
122
) &&
123
git ls-remote dst refs/heads/master >expect &&
124
git ls-remote src refs/heads/master >actual &&
@@ -147,7 +151,8 @@ test_expect_success 'push to delete (allowed)' '
151
setup_srcdst_basic &&
152
(
153
cd dst &&
150
- git push --force-with-lease=master origin :master
154
+ git push --force-with-lease=master origin :master 2>err &&
155
+ grep deleted err
156
) &&
157
>expect &&
158
git ls-remote src refs/heads/master >actual &&