Re: [Gitclipse-devel] Commit question

[Andrew C. <ac...@co...>]

You can even have a modified staged and modified unstaged at the same 
time which gets even more confusing for the user.

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   src/edu/nyu/cs/hello/Hello.java
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	modified:   src/edu/nyu/cs/hello/Hello.java
#

--
Drew


On Wed, 30 Jul 2008, Andrew Case wrote:

> Nope, I'm wrong.  I must have run commit -a.  We have the same problem
> after a git-mv and then modified.
>
> --
> Drew
>
>
> On Wed, 30 Jul 2008, Andrew Case wrote:
>
>> When you commit a file managed by git after it has been "added with unstaged
>> modifications" it just commits it as a standard add (including the
>> modifications).  If we treat files that show up in both "added (staged)" and
>> "unstaged modifications" as if the file was simply in "added (and staged)" is
>> this a problem?
>>
>> --
>> Drew
>>
>>
>> On Wed, 30 Jul 2008, Michelle S Osborne wrote:
>>
>>> Hey guys,
>>>
>>> Paul posted a bug which turns out to be interesting because I'm not sure
>>> what the desired functionality is. The bug is that if you add a file and
>>> then further modify it before committing, it will turn up in the list of
>>> files to commit twice, once as added and once as modified/unstaged. The
>>> reason for this is because javagit returns the file as both added and
>>> modified/unstaged, which in turn is because git status lists the file twice
>>> in the same fashion.
>>>
>>> One solution would be to list the file as 'added with unstaged
>>> modifications' or something like that. The thing that's slightly weird
>>> about that is that you'd see the file listed with a different status
>>> depending on which radio button was selected - the 'staged only' button
>>> would show the file only as added, because if you're only committing staged
>>> changes you won't commit the modification. The 'all changes' and 'selected'
>>> radio buttons would show it as 'added with unstaged modifications'.
>>>
>>> Another option is to leave it as is, so that the 'staged only' button would
>>> just list the file as 'added', while the other two buttons would show two
>>> files with different statuses. That's also slightly weird in that it would
>>> probably appear to be a bug, except maybe to people who are very familiar
>>> with git command line responses. Perhaps there's some description that
>>> could be put into the table header or somewhere else in the dialog that
>>> would make it clear why there were duplicate files listed?
>>>
>>> I'm not sure if there are better options that I'm missing. Any suggestions?
>>>
>>> Michelle
>>>
>>> -------------------------------------------------------------------------
>>> This SF.Net email is sponsored by the Moblin Your Move Developer's
>>> challenge
>>> Build the coolest Linux based applications with Moblin SDK & win great
>>> prizes
>>> Grand prize is a trip for two to an Open Source event anywhere in the world
>>> http://moblin-contest.org/redirect.php?banner_id=100&url=/
>>> _______________________________________________
>>> Gitclipse-devel mailing list
>>> Git...@li...
>>> https://lists.sourceforge.net/lists/listinfo/gitclipse-devel
>>>
>>
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Gitclipse-devel mailing list
> Git...@li...
> https://lists.sourceforge.net/lists/listinfo/gitclipse-devel
>