Re: Possible bug with git status in 1.7.0

From: Sergio Callegari <sergio.callegari@gmail.com>
Date: Feb 19, 2010, 16:42 UTC
Message-ID: <4B7EBF7B.3090703@gmail.com>
In-Reply-To: <4B7C5711.8060708@web.de>

Jens Lehmann wrote:

Show 30 quoted lines

>> The wording of the reminder is a bit unclear, though.  Suppose that the
>> problem is with submodule "mod".
>>
>> What you get from git status is a notice that something is modified but
>> not updated, with the following suggestion
>>
>> # Changed but not
>> updated:                                                                                     
>>
>> #   (use "git add <file>..." to update what will be committed)
>>
>> and then the notice about what is in fact modified
>>
>> #       modified:   mod
>>
>>
>> So the first problem is that now git status provides a hint that may be
>> confusing.  One gets the idea that he needs to add mod (to store a new
>> commit id in the index) and not to add a file in mod.
>>     
>
> That is a very valid point. I am currently working on git status being
> more explicit about the type of modification. I just asked for comments
> on this issue on February 14th in the thread titled "[PATCH/RFC] git
> diff --submodule: Show detailed dirty status of submodules" (Gmane is
> down for me right now, so i am sorry: no link today).
>
> The changes i have in mind for git status would also include giving a
> better hint, as you rightfully pointed out.
>

Missed that, thanks for pointing out

Show 31 quoted lines

>> As a second issue, note that mod is in fact not really modified being that
>>
>> 1) no tracked file in it has been modified.
>> 2) no new commit has been made
>>
>> and the fact is that from git status I cannot recognize anymore if the
>> module is really changed (the module commit id has changed) or has
>> uncommited changes (some tracked file is changed) or is merely polluted
>> by untracked files, so now I always need to explore the submodule.
>>
>> It is true that this can be solved putting more stuff in .gitignore.
>> However, it might be a matter of taste, but I do not like putting all
>> byproducts in .gitignore  because not doing so allows me to
>> differentiate between
>>
>> - files that are just garbage
>> - files that are not tracked but may be still precious
>>
>> and selectively clean either category using the -x or -X options of git
>> clean.
>>
>>
>> So, it would be nice to improve the feedback of git status for this
>> particular case and possibly have an option to avoid status being so
>> wordy about untracked files.
>>     
>
> So i assume that my proposal to explicitly state that a submodule has
> new commits, modified files and/or untracked files would solve your
> woes?
>

Yes! My ideal behavior (if I am not asking too much) would be trying to keep the status as little wordy as possible (1 line per submodule)

e.g. something like

# modified module (commit id): mod1 # modified module (modified files): mod2 # modified module (untracked files): mod3 # modified module (modified files, untracked files): mod4 # modified module (commit id, modified files, untracked files): mod5

and with an option to avoid complaining about untracked files in the submodules

e.g. if option is not selected, entry about mod3 would not be printed at all.

And of course it would be useful to modify the suggestions into something like

# (use "git add <file>/<submodule>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (enter modules that have modified/untracked files to perform actions on them)

Thanks,

Sergio