From: Bertrand BENOIT <projettwk@users.sourceforge.net>
To: git@vger.kernel.org
Subject: Bug report - local (and git ignored) file silently removed after checkout
Date: Sun, 20 Nov 2011 14:42:36 +0100 [thread overview]
Message-ID: <CAPRVejcpAZrLWCeHTZJr9Uk6_z6hTPQLLd6pCOKteYnRGMQ5ig@mail.gmail.com> (raw)
Hi,
In a (special ?) situation, I've lost a local (and git ignored) file
silently, and I've failed to get it back.
Context:
- in previous version of my project, the TODO file was versioned
- in current development version, this file is NO more versioned AND
it is ignored by a gitignore rule, but still at the same place for
better ease of access -> such a way, this file has been locally
updated several times
- during worflow process, I've finally performed a checkout on a
previous version (in which the TODO file was versioned) -> after that
the file has been silently updated with the old version
- after modification, I've performed back a checkout on the current
version and this time my TODO file has been fully and silently removed
Questions:
- is it a behavior regarded as normal ?
- is there any way to get back the TODO file, in LOCAL version it
was before the first checkout ?
- in any case, is there any way to be warned (and to make the
checkout fail) of such situation (local ignored file being overwritten
with 'older' not-ignored version) ?
Thx,
Best regards,
TWK
next reply other threads:[~2011-11-20 13:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 13:42 Bertrand BENOIT [this message]
2011-11-20 21:16 ` Bug report - local (and git ignored) file silently removed after checkout Junio C Hamano
2011-11-20 22:19 ` Taylor Hedberg
2011-11-21 3:36 ` Junio C Hamano
2011-11-21 7:23 ` [PATCH] Add test that checkout does not overwrite entries in .git/info/exclude Johannes Sixt
2011-11-21 7:45 ` Philip Oakley
2011-11-21 7:59 ` Junio C Hamano
2011-11-21 7:50 ` Junio C Hamano
2011-11-21 8:52 ` Nguyen Thai Ngoc Duy
2011-11-21 17:27 ` Junio C Hamano
2011-11-23 11:31 ` Nguyen Thai Ngoc Duy
2011-11-21 8:17 ` Nguyen Thai Ngoc Duy
2011-11-21 15:18 ` Junio C Hamano
2011-11-21 15:44 ` Bertrand BENOIT
2011-11-23 11:40 ` Nguyen Thai Ngoc Duy
2011-11-23 17:16 ` Junio C Hamano
2011-11-24 1:35 ` Nguyen Thai Ngoc Duy
2011-11-24 5:17 ` Junio C Hamano
2011-11-24 5:39 ` Nguyen Thai Ngoc Duy
2011-11-27 10:13 ` Nguyen Thai Ngoc Duy
2011-11-27 10:15 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Nguyễn Thái Ngọc Duy
2011-11-27 10:15 ` [PATCH 2/2] checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore Nguyễn Thái Ngọc Duy
2011-11-29 18:17 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPRVejcpAZrLWCeHTZJr9Uk6_z6hTPQLLd6pCOKteYnRGMQ5ig@mail.gmail.com \
--to=projettwk@users.sourceforge.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).