From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Mon, 06 Dec 2010 21:28:12 GMT
Subject: Re: [PATCH/RFC] git-gui: disable (un)staging for files with typechange flags
Message-ID: <AANLkTik9ZSSQ5pXs6wpU6dXGmVTJ=LTY6CQn79Pup9o1@mail.gmail.com>
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