push: fix local refs update if already up-to-date
git push normally updates local refs only after a successful push. If the remote already has the updates -- pushed indirectly through another repository, for example -- we forget to update local tracking refs. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5bdd8d4a30
commit
16ed2f48be
@ -222,7 +222,7 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref)
|
||||
{
|
||||
struct refspec rs;
|
||||
|
||||
if (ref->status != REF_STATUS_OK)
|
||||
if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
|
||||
return;
|
||||
|
||||
rs.src = ref->name;
|
||||
@ -424,24 +424,19 @@ static int do_send_pack(int in, int out, struct remote *remote, const char *dest
|
||||
*/
|
||||
new_refs = 0;
|
||||
for (ref = remote_refs; ref; ref = ref->next) {
|
||||
const unsigned char *new_sha1;
|
||||
|
||||
if (!ref->peer_ref) {
|
||||
if (!args.send_mirror)
|
||||
if (ref->peer_ref)
|
||||
hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
|
||||
else if (!args.send_mirror)
|
||||
continue;
|
||||
new_sha1 = null_sha1;
|
||||
}
|
||||
else
|
||||
new_sha1 = ref->peer_ref->new_sha1;
|
||||
|
||||
|
||||
ref->deletion = is_null_sha1(new_sha1);
|
||||
ref->deletion = is_null_sha1(ref->new_sha1);
|
||||
if (ref->deletion && !allow_deleting_refs) {
|
||||
ref->status = REF_STATUS_REJECT_NODELETE;
|
||||
continue;
|
||||
}
|
||||
if (!ref->deletion &&
|
||||
!hashcmp(ref->old_sha1, new_sha1)) {
|
||||
!hashcmp(ref->old_sha1, ref->new_sha1)) {
|
||||
ref->status = REF_STATUS_UPTODATE;
|
||||
continue;
|
||||
}
|
||||
@ -469,14 +464,13 @@ static int do_send_pack(int in, int out, struct remote *remote, const char *dest
|
||||
!ref->deletion &&
|
||||
!is_null_sha1(ref->old_sha1) &&
|
||||
(!has_sha1_file(ref->old_sha1)
|
||||
|| !ref_newer(new_sha1, ref->old_sha1));
|
||||
|| !ref_newer(ref->new_sha1, ref->old_sha1));
|
||||
|
||||
if (ref->nonfastforward && !ref->force && !args.force_update) {
|
||||
ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
|
||||
continue;
|
||||
}
|
||||
|
||||
hashcpy(ref->new_sha1, new_sha1);
|
||||
if (!ref->deletion)
|
||||
new_refs++;
|
||||
|
||||
|
@ -437,6 +437,37 @@ test_expect_success 'push updates local refs' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'push updates up-to-date local refs' '
|
||||
|
||||
rm -rf parent child &&
|
||||
mkdir parent &&
|
||||
(cd parent && git init &&
|
||||
echo one >foo && git add foo && git commit -m one) &&
|
||||
git clone parent child1 &&
|
||||
git clone parent child2 &&
|
||||
(cd child1 &&
|
||||
echo two >foo && git commit -a -m two &&
|
||||
git push) &&
|
||||
(cd child2 &&
|
||||
git pull ../child1 master &&
|
||||
git push &&
|
||||
test $(git rev-parse master) = $(git rev-parse remotes/origin/master))
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'push preserves up-to-date packed refs' '
|
||||
|
||||
rm -rf parent child &&
|
||||
mkdir parent &&
|
||||
(cd parent && git init &&
|
||||
echo one >foo && git add foo && git commit -m one) &&
|
||||
git clone parent child &&
|
||||
(cd child &&
|
||||
git push &&
|
||||
! test -f .git/refs/remotes/origin/master)
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'push does not update local refs on failure' '
|
||||
|
||||
rm -rf parent child &&
|
||||
|
Loading…
Reference in New Issue
Block a user