[Gitclipse-devel] Commit question

[Michelle S O. <ms...@ny...>]

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