git-gui: Rephrase rescan before commit informational message.
Its not an error that a rescan is required before commit; its just something we do as a safety feature to try and ensure the user knows what is going into this commit. So the dialog should use the info icon (if one is used by the host OS) rather than the error icon. Its also not "highly likely" that another Git program modified the repository, its completely the case. There is no reason why the repository would not match our last scanned state unless another Git program modified the repository (or someone else did so by hand). So don't be vague about it, own up to the issue and go on with our business. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Nov 18, 2006 at 21:13 UTC
bca680b054ffa736e876075fad358bee1caa898a
1 file changed
+5
-5
git-gui
+5
-5
@@ -765,13 +765,13 @@ proc commit_tree {} {
765
&& $cur_type eq {normal}
766
&& $curHEAD eq $HEAD} {
767
} elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
768
- error_popup {Last scanned state does not match repository state.
768
+ info_popup {Last scanned state does not match repository state.
769
770
-Its highly likely that another Git program modified the
771
-repository since the last scan. A rescan is required
772
-before committing.
770
+Another Git program has modified this repository
771
+since the last scan. A rescan must be performed
772
+before another commit can be created.
773
774
-A rescan will be automatically started now.
774
+The rescan will be automatically started now.
775
}
776
unlock_index
777
rescan {set ui_status_value {Ready.}}