| commit | 14efcc748597f8b00d362df26adf5c4b4b7777f7 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Jan 2007 18:34:00 +0000 (21 13:34 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 22 Jan 2007 03:47:55 +0000 (21 22:47 -0500) | ||
| tree | 51775e26f31e6bb095b63f4d25235d62f8720166 | treesnapshot (tar.gz zip) |
| parent | 68c30b4af1b1d6f95ae6724364641aa787247f0f | commitdiff |
git-gui: Correct unmerged file detection at commit time.
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>
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>
| git-gui.sh | diffblobblamehistory |