@matheusbsbs / matheus-bagliano / commits / 4c2035d55e
Fork 0

git-gui: Improve pull error dialogs.

Just like prior to a commit its only an informational message that we refuse to perform a pull on a dirty working directory. Therefore we should not use an error icon. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Nov 22, 2006 at 19:24 UTC 4c2035d55e0a5c013677a8e83193e37d51000793
1 file changed +11 -7
git-gui
+11 -7
@@ -1122,11 +1122,13 @@ proc pull_remote {remote branch} {
1122 #
1123 repository_state curType curHEAD curMERGE_HEAD
1124 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1125 - error_popup {Last scanned state does not match repository state.
1125 + info_popup {Last scanned state does not match repository state.
1126
1127 -Its highly likely that another Git program modified the
1128 -repository since our last scan. A rescan is required
1129 -before a pull can be started.
1127 +Another Git program has modified this repository
1128 +since the last scan. A rescan must be performed
1129 +before a pull operation can be started.
1130 +
1131 +The rescan will be automatically started now.
1132 }
1133 unlock_index
1134 rescan {set ui_status_value {Ready.}}
@@ -1138,10 +1140,12 @@ before a pull can be started.
1140 if {[array size file_states] != 0} {
1141 error_popup {Uncommitted but modified files are present.
1142
1141 -You should not perform a pull with unmodified files in your working
1142 -directory as Git would be unable to recover from an incorrect merge.
1143 +You should not perform a pull with unmodified
1144 +files in your working directory as Git will be
1145 +unable to recover from an incorrect merge.
1146
1144 -Commit or throw away all changes before starting a pull operation.
1147 +You should commit or revert all changes before
1148 +starting a pull operation.
1149 }
1150 unlock_index
1151 return