git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "igor.mikushkin" <igor.mikushkin@gmail.com>
To: git@vger.kernel.org
Subject: Why git silently replaces untracked files?
Date: Fri, 25 Mar 2011 07:52:34 -0700 (PDT)	[thread overview]
Message-ID: <1301064754576-6207950.post@n2.nabble.com> (raw)

Why git silently replaces untracked files?

# mkdir test.git
# mkdir 1
# mkdir 2
# echo 1 > 1/test
# echo 2 > 2/test
# cd test.git
# git init --bare
# cd ..
# git clone test.git
# cp -r test/.git 1
# cp -r test/.git 2
# cd 1
# git add test
# git commit -am 1
# git push origin master
# cd ../2
# git pull
# cat test
1

In my opinion it is wrong behavior.
I've just lost important file due to it.

Should not "git pull" fail here?
Anyhow it looks more correct then silent replacing.

Thanks,
Igor





--
View this message in context: http://git.661346.n2.nabble.com/Why-git-silently-replaces-untracked-files-tp6207950p6207950.html
Sent from the git mailing list archive at Nabble.com.

             reply	other threads:[~2011-03-25 14:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-25 14:52 igor.mikushkin [this message]
2011-03-25 16:58 ` Why git silently replaces untracked files? Jeff King
2011-03-25 17:53   ` igor.mikushkin
2011-03-25 18:06     ` Jeff King
2011-03-25 18:08       ` [PATCH 1/4] t7607: mark known breakage in test 11 as fixed Jeff King
2011-03-25 18:09       ` [PATCH 2/4] t7607: clean up stray untracked file Jeff King
2011-03-25 18:10       ` [PATCH 3/4] merge: merge unborn index before setting ref Jeff King
2011-03-25 18:13       ` [PATCH 4/4] pull: do not clobber untracked files on initial pull Jeff King

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=1301064754576-6207950.post@n2.nabble.com \
    --to=igor.mikushkin@gmail.com \
    --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).