git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Zorba" <cr@altmore.co.uk>
To: git@vger.kernel.org
Subject: Re: for newbs = little exercise / tutorial / warmup for windows and other non-sophisticated new Git users :-)
Date: Tue, 30 Dec 2008 17:22:13 -0000	[thread overview]
Message-ID: <gjdlcl$5no$4@ger.gmane.org> (raw)
In-Reply-To: gjdh0r$n3c$4@ger.gmane.org

Ok, when I do

$ rm *.*
$ git checkout versionA .

I'm getting ABC.txt, AC.txt, BC.txt

which is wrong as only the first two files went into version A

Paradoxically

$ rm *.*
$ git reset --hard versionA

produces the desired result!

I picked up a few cases like this with git-checkout today. Usually a file or 
two gets copied into the working tree that shouldn't have been (and I'm 
clearing the working tree before each checkout, so its not "leftovers", its 
defo git-checkout doing it)

Its coming back to me now - when I was writing my "warm-up" I tried both 
git-checkout and git-reset, to do my "rollbacks" and git-checkout produced a 
few inconsistent results like above, so I decided to stick with git-reset 
(this was before I knew the dangers of git-reset of course!) for "safety".

Could it be that all the "vandalism" I've perpetrated to the history by 
resetting in a FORWARD direction could have corrupted the history somehow ?

Even so, you'd expect something vanilla like $ git checkout  not to be 
affected.

I'm gonna try the checkouts without doing any resetting beforehand (i.e. no 
messing with the history) to see if I can reproduce this.



"Zorba" <cr@altmore.co.uk> wrote in message 
news:gjdh0r$n3c$4@ger.gmane.org...

** have now promoted git-checkout as the way to review older versions
I've left git-reset in there, for my own notes as much as anything, but not
suggesting it be used as some sort of cursor to move the HEAD up and down
the branch

NB getting some funny results with git-checkout near the head of the branch
- will investigatge and report

  reply	other threads:[~2008-12-30 17:24 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-27 21:56 for newbs = little exercise / tutorial / warmup for windows and other non-sophisticated new Git users :-) Zorba
2008-12-28  1:29 ` Zorba
2008-12-29 23:05   ` Jeff Whiteside
2008-12-30  4:24     ` Zorba
2008-12-30  5:33       ` Jeff Whiteside
2008-12-30 12:19         ` Zorba
2008-12-30  5:34       ` Sitaram Chamarty
2008-12-30 16:07     ` Zorba
2008-12-30 17:22       ` Zorba [this message]
2008-12-30 17:44         ` Zorba
2008-12-30 18:35           ` Jeff Whiteside
2008-12-30 21:39             ` Zorba
2008-12-30 22:03               ` Jeff Whiteside
2008-12-30 23:29               ` Daniel Barkalow
2008-12-31  0:31                 ` Zorba
2008-12-30 21:27           ` Zorba
2008-12-30 21:49             ` Boyd Stephen Smith Jr.
2008-12-30 22:17               ` Boyd Stephen Smith Jr.
2008-12-30 22:39                 ` Boyd Stephen Smith Jr.
2008-12-31  1:43             ` Sitaram Chamarty
2008-12-30 19:42 ` Daniel Barkalow

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='gjdlcl$5no$4@ger.gmane.org' \
    --to=cr@altmore.co.uk \
    --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).