From bca680b054ffa736e876075fad358bee1caa898a Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 18 Nov 2006 21:13:16 -0500 Subject: [PATCH] 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 --- git-gui | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-gui b/git-gui index 7630a2d2e..23efe4742 100755 --- a/git-gui +++ b/git-gui @@ -765,13 +765,13 @@ proc commit_tree {} { && $cur_type eq {normal} && $curHEAD eq $HEAD} { } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} { - error_popup {Last scanned state does not match repository state. + info_popup {Last scanned state does not match repository state. -Its highly likely that another Git program modified the -repository since the last scan. A rescan is required -before committing. +Another Git program has modified this repository +since the last scan. A rescan must be performed +before another commit can be created. -A rescan will be automatically started now. +The rescan will be automatically started now. } unlock_index rescan {set ui_status_value {Ready.}} -- 2.30.2