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

git-gui: Improve pull error dialogs.

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2006-11-22 19:24:41 -05:00
parent 5040f926f9
commit 4c2035d55e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-gui
View File

@ -1122,11 +1122,13 @@ proc pull_remote {remote branch} {
# #
repository_state curType curHEAD curMERGE_HEAD repository_state curType curHEAD curMERGE_HEAD
if {$commit_type ne $curType || $HEAD ne $curHEAD} { if {$commit_type ne $curType || $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 Another Git program has modified this repository
repository since our last scan. A rescan is required since the last scan. A rescan must be performed
before a pull can be started. before a pull operation can be started.
The rescan will be automatically started now.
} }
unlock_index unlock_index
rescan {set ui_status_value {Ready.}} rescan {set ui_status_value {Ready.}}
@ -1138,10 +1140,12 @@ before a pull can be started.
if {[array size file_states] != 0} { if {[array size file_states] != 0} {
error_popup {Uncommitted but modified files are present. error_popup {Uncommitted but modified files are present.
You should not perform a pull with unmodified files in your working You should not perform a pull with unmodified
directory as Git would be unable to recover from an incorrect merge. files in your working directory as Git will be
unable to recover from an incorrect merge.
Commit or throw away all changes before starting a pull operation. You should commit or revert all changes before
starting a pull operation.
} }
unlock_index unlock_index
return return