From: Johannes Sixt <j6t@kdbg.org>
To: KES <kes-kes@yandex.ru>, git <git@vger.kernel.org>
Subject: Re: Git allow to unconditionaly remove files on other developer host
Date: Sat, 15 Apr 2017 14:27:00 +0200 [thread overview]
Message-ID: <c09e2447-a528-9da1-9936-9b0ebfdddd78@kdbg.org> (raw)
In-Reply-To: <4747541492256174@web25g.yandex.ru>
Am 15.04.2017 um 13:36 schrieb KES:
> That curious, but git allow to unconditionally delete files on other developer host when he do `git pull`
>
> How to reproduce:
>
> 1. File should be ignored:
> echo "somefile" >> .gitignore
>
> 2. Add this ignored file into repository
> git add -f somefile
>
> 3. Push changes to origin
> git push
>
> 4. When other developer has also 'somefile' on his host and when he does
> git pull
>
> Content of hist local `somefile` file will be replaced by content pushed by first developer
This happens *only* if the other developers also have somefile mentioned
in their .gitignore.
>
> EXPECTED: git should warn about that content will be replaced and do not pull/checkout until we force pull/checkout
If somefile is *not* mentioned in their .gitignore, the file is not
removed and there is a warning.
Know that Git regards everything mentioned in .gitignore as dispensible;
IOW, by mentioning a file in .gitignore you actually give permission to
remove the file if necessary. Git does not have a feature to say "ignore
this file, but it is precious".
-- Hannes
next prev parent reply other threads:[~2017-04-15 12:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-15 11:36 Git allow to unconditionaly remove files on other developer host KES
2017-04-15 12:27 ` Johannes Sixt [this message]
2017-04-15 12:53 ` Konstantin Khomoutov
2018-01-06 12:06 ` KES
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=c09e2447-a528-9da1-9936-9b0ebfdddd78@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=kes-kes@yandex.ru \
/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).