git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Pat Thoyts <patthoyts@users.sourceforge.net>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
	git@vger.kernel.org, Bert Wesarg <bert.wesarg@googlemail.com>,
	Gustaf Hendeby <hendeby@isy.liu.se>
Subject: Re: [PATCH/RFC] git-gui: disable (un)staging for files with typechange flags
Date: Mon, 6 Dec 2010 22:28:12 +0100	[thread overview]
Message-ID: <AANLkTik9ZSSQ5pXs6wpU6dXGmVTJ=LTY6CQn79Pup9o1@mail.gmail.com> (raw)
In-Reply-To: <AANLkTimz-XZQzTygKxQDJ+E6ZJm1+8aZNuKfZ6-AwQh3@mail.gmail.com>

On Fri, Dec 3, 2010 at 14:34, Bert Wesarg <bert.wesarg@googlemail.com> wrote:
> [ Adding Gustaf Hendeby, the author of the first patch to support type changes ]
>
> On Tue, Nov 30, 2010 at 23:21, Bert Wesarg <bert.wesarg@googlemail.com> wrote:
>> This covers also the case for newly added files in the index. Like this:
>>
>>    echo bar >foo
>>    git add foo
>>    rm foo
>>    ln -s bar foo
>>
>> This will result in an state of AT. And for cases where the type change is
>> staged, and the new type was modified after the staging. Like this (cont.):
>>
>>    git add foo
>>    git commit -mfoo
>>    rm foo
>>    echo bar >foo
>>    git add foo
>>    echo baz >foo
>>
>> Will result in an state of TM for foo.

This patch is incomplete. There are more places where the new AT and
TM states needs to be handled. Please wait for a re-roll.

Bert

  reply	other threads:[~2010-12-06 21:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-30 22:21 [PATCH/RFC] git-gui: disable (un)staging for files with typechange flags Bert Wesarg
2010-12-03 13:34 ` Bert Wesarg
2010-12-06 21:28   ` Bert Wesarg [this message]
2010-12-06 21:48 ` Pat Thoyts
2010-12-06 22:17   ` Bert Wesarg

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='AANLkTik9ZSSQ5pXs6wpU6dXGmVTJ=LTY6CQn79Pup9o1@mail.gmail.com' \
    --to=bert.wesarg@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=hendeby@isy.liu.se \
    --cc=patthoyts@users.sourceforge.net \
    --cc=spearce@spearce.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).