From: Thomas Rast <trast@inf•ethz.ch>
To: Junio C Hamano <gitster@pobox•com>
Cc: Jim Greenleaf <james.a.greenleaf@gmail•com>,
<git@vger•kernel.org>, "Petr Baudis" <pasky@ucw•cz>
Subject: Re: git stash deletes/drops changes of
Date: Fri, 24 May 2013 00:56:50 +0200 [thread overview]
Message-ID: <87obc15mq5.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <7vd2shcnx7.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 23 May 2013 15:49:08 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Thomas Rast <trast@inf•ethz.ch> writes:
>
>> So maybe it would be time to first make up our minds as to what
>> --assume-unchanged should actually mean:
>>
>> * Ignore changes to a tracked file, but treat them as valuable. In
>> this case we'd have to make sure that failures like git-stash's are
>> handled properly.
>>
>> * Ignore changes to a tracked file, as in "who cares if it was changed".
>>
>> * A very specific optimization for users who know what they are doing.
>
> It has always been a promise the user makes to Git that the working
> tree files that are marked as such will be kept identical to what is
> in the index (hence there is no need for Git to check if they were
> modified). And by extension, Git is now free to choose reading from
> the working tree file when asked to read from blob object recorded
> in the index for that path, or vice versa, because of that promise.
>
> It is not --ignore-changes bit, and has never been. What are the
> workflows that are helped if we had such a bit? If we need to
> support them, I think you need a real --ignore-changes bit, not
> an abuse of --assume-unchanged.
I gather -- from #git -- that it's mostly used for config files, which
have an annoying habit of being different from the repository.
Which is wrong, really. But we still claim that --assume-unchanged is a
solution to it in git-update-index(1).
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2013-05-23 22:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-04 16:24 git stash deletes/drops changes of "assume-unchanged" files Adeodato Simó
2013-05-23 16:57 ` git stash deletes/drops changes of Jim Greenleaf
2013-05-23 22:10 ` Thomas Rast
2013-05-23 22:49 ` Junio C Hamano
2013-05-23 22:56 ` Thomas Rast [this message]
2013-05-23 23:20 ` Junio C Hamano
2013-05-24 15:25 ` Phil Hord
2013-05-24 15:34 ` Jim Greenleaf
2013-05-24 15:38 ` John Keeping
2013-05-24 15:42 ` Jim Greenleaf
2013-05-24 16:01 ` John Keeping
2013-05-23 23:57 ` Petr Baudis
2013-05-24 8:22 ` John Keeping
2013-05-24 9:40 ` Petr Baudis
2013-05-24 10:06 ` John Keeping
2013-05-24 10:14 ` Petr Baudis
2013-05-24 10:40 ` John Keeping
2013-05-24 11:03 ` Petr Baudis
2013-05-24 12:42 ` John Keeping
2013-05-24 14:26 ` Stephen Bash
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=87obc15mq5.fsf@linux-k42r.v.cablecom.net \
--to=trast@inf$(echo .)ethz.ch \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=james.a.greenleaf@gmail$(echo .)com \
--cc=pasky@ucw$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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