undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Correct unmerged file detection at commit time.

Browse Source 
Its impossible to commit an index which has unmerged stages.

Unfortunately a bug in git-gui allowed the user to try to do exactly that,
as we broke out of our file scanning loop as soon as we found a valid AMD
index state.  That's wrong, as the files are coming back from our array
in pseudo-random order; an unmerged file may get returned only after all
merged files.

I also noticed the grammer around here in our dialog boxes still used
the term 'include', so this has been updated to reflect current usage.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-01-21 13:34:00 -05:00
parent 68c30b4af1
commit 14efcc7485
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-gui.sh
View File

@ -896,12 +896,12 @@ The rescan will be automatically started now.
_? {continue} _? {continue}
A? - A? -
D? - D? -
M? {set files_ready 1; break} M? {set files_ready 1}
U? { U? {
error_popup "Unmerged files cannot be committed. error_popup "Unmerged files cannot be committed.
File [short_path $path] has merge conflicts. File [short_path $path] has merge conflicts.
You must resolve them and include the file before committing. You must resolve them and add the file before committing.
" "
unlock_index unlock_index
return return
@ -915,9 +915,9 @@ File [short_path $path] cannot be committed by this program.
} }
} }
if {!$files_ready} { if {!$files_ready} {
error_popup {No included files to commit. error_popup {No changes to commit.
You must include at least 1 file before you can commit. You must add at least 1 file before you can commit.
} }
unlock_index unlock_index
return return