Browse Source

git-gui: Remove 'Allow Partially Added Files' option.

Now that we take the approach of core Git where we allow the user to
stage their changes directly into the index all of the time there is
absolutely no reason to have the Allow Partially Added Files option,
nor is there a reason or desire to default that option to false.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Shawn O. Pearce 18 years ago
parent
commit
6f48f3a688
  1. 41
      git-gui.sh

41
git-gui.sh

@ -524,24 +524,6 @@ proc rescan_done {fd buf after} { @@ -524,24 +524,6 @@ proc rescan_done {fd buf after} {
prune_selection
unlock_index
display_all_files

if {$repo_config(gui.partialinclude) ne {true}} {
set pathList [list]
foreach path [array names file_states] {
switch -- [lindex $file_states($path) 0] {
A? -
M? {lappend pathList $path}
}
}
if {$pathList ne {}} {
update_index \
"Updating included files" \
$pathList \
[concat {reshow_diff;} $after]
return
}
}

reshow_diff
uplevel #0 $after
}
@ -918,27 +900,6 @@ A good commit message has the following format: @@ -918,27 +900,6 @@ A good commit message has the following format:
return
}

# -- Update included files if partialincludes are off.
#
if {$repo_config(gui.partialinclude) ne {true}} {
set pathList [list]
foreach path [array names file_states] {
switch -glob -- [lindex $file_states($path) 0] {
A? -
M? {lappend pathList $path}
}
}
if {$pathList ne {}} {
unlock_index
update_index \
"Updating included files" \
$pathList \
[concat {lock_index update;} \
[list commit_prehook $curHEAD $msg]]
return
}
}

commit_prehook $curHEAD $msg
}

@ -2939,7 +2900,6 @@ proc do_options {} { @@ -2939,7 +2900,6 @@ proc do_options {} {
pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5

foreach option {
{b partialinclude {Allow Partially Added Files}}
{b pullsummary {Show Pull Summary}}
{b trustmtime {Trust File Modification Timestamps}}
{i diffcontext {Number of Diff Context Lines}}
@ -3299,7 +3259,6 @@ proc apply_config {} { @@ -3299,7 +3259,6 @@ proc apply_config {} {

set default_config(gui.trustmtime) false
set default_config(gui.pullsummary) true
set default_config(gui.partialinclude) false
set default_config(gui.diffcontext) 5
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]

Loading…
Cancel
Save