git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Jakma <paul@clubi.ie>
To: git list <git@vger.kernel.org>
Subject: git-reset and clones
Date: Thu, 16 Mar 2006 14:34:42 +0000 (GMT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0603161424310.5276@sheen.jakma.org> (raw)

Hi,

Next dumb question:

If a git repository has a reset HEAD~X done, then any later pulls in 
clone repositories get /really/ upset, with:

$ git pull
* refs/heads/origin: does not fast forward to branch 'master' of 
/home/paul/foo-git/;

Type of thing. This seems to be a similar issue to:

 	http://www.gelato.unsw.edu.au/archives/git/0510/10767.html

The question is has this improved at all since last year? Is there 
anything the origin repository maintainer (the one who did reset) can 
do to recover from this?

I'm guessing the answer is:

Yes:

1. where git-reset has already been done, manually update the
   refs back to the previous HEAD
2. then use git-revert, and continue to use git-revert only.

My question then would be, presuming some innocent repository 
maintainer has already done 1, what's the easiest way to accomplish 
1?

(they shouldn't have done it obviously, but assume they're git 
newbies, made an honest mistake and now need to recover, preferably 
without having to involve those who pull).

regards,
-- 
Paul Jakma	paul@clubi.ie	paul@jakma.org	Key ID: 64A2FF6A
Fortune:
Be cautious in your daily affairs.

             reply	other threads:[~2006-03-16 14:35 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-16 14:34 Paul Jakma [this message]
     [not found] ` <20060316095213.2a8f650a.seanlkml@sympatico.ca>
2006-03-16 14:52   ` git-reset and clones sean
2006-03-16 15:48     ` Paul Jakma
2006-03-16 14:53 ` Andreas Ericsson
2006-03-16 14:59   ` Andreas Ericsson
     [not found]   ` <20060316102145.35294eed.seanlkml@sympatico.ca>
2006-03-16 15:21     ` sean
2006-03-17  2:10 ` Junio C Hamano
2006-03-17 19:19   ` Jon Loeliger
2006-03-17 20:39     ` Junio C Hamano
2006-03-17 21:00       ` Jon Loeliger
2006-03-17 21:21     ` Andreas Ericsson
2006-03-19 21:40   ` Petr Baudis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0603161424310.5276@sheen.jakma.org \
    --to=paul@clubi.ie \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).