git-gui: Use git-config now over git-repo-config.
Now that core Git has "renamed" git-repo-config to git-config, we should do the same. I don't know how long core Git will keep the repo-config command, and since git-gui's userbase is so small and almost entirely on some flavor of 1.5.0-rc2 or later, where the rename has already taken place, it should be OK to rename now. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Feb 8, 2007 at 19:53 UTC
df6287ecd78206095796512bca80e87cc5a5e33b
1 file changed
+8
-8
git-gui.sh
+8
-8
@@ -140,7 +140,7 @@ proc load_config {include_global} {
140
array unset global_config
141
if {$include_global} {
142
catch {
143
- set fd_rc [open "| git repo-config --global --list" r]
143
+ set fd_rc [open "| git config --global --list" r]
144
while {[gets $fd_rc line] >= 0} {
145
if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
146
if {[is_many_config $name]} {
@@ -156,7 +156,7 @@ proc load_config {include_global} {
156
157
array unset repo_config
158
catch {
159
- set fd_rc [open "| git repo-config --list" r]
159
+ set fd_rc [open "| git config --list" r]
160
while {[gets $fd_rc line] >= 0} {
161
if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
162
if {[is_many_config $name]} {
@@ -202,14 +202,14 @@ proc save_config {} {
202
set value $global_config_new($name)
203
if {$value ne $global_config($name)} {
204
if {$value eq $default_config($name)} {
205
- catch {exec git repo-config --global --unset $name}
205
+ catch {exec git config --global --unset $name}
206
} else {
207
regsub -all "\[{}\]" $value {"} value
208
- exec git repo-config --global $name $value
208
+ exec git config --global $name $value
209
}
210
set global_config($name) $value
211
if {$value eq $repo_config($name)} {
212
- catch {exec git repo-config --unset $name}
212
+ catch {exec git config --unset $name}
213
set repo_config($name) $value
214
}
215
}
@@ -219,10 +219,10 @@ proc save_config {} {
219
set value $repo_config_new($name)
220
if {$value ne $repo_config($name)} {
221
if {$value eq $global_config($name)} {
222
- catch {exec git repo-config --unset $name}
222
+ catch {exec git config --unset $name}
223
} else {
224
regsub -all "\[{}\]" $value {"} value
225
- exec git repo-config $name $value
225
+ exec git config $name $value
226
}
227
set repo_config($name) $value
228
}
@@ -4151,7 +4151,7 @@ proc do_quit {} {
4151
set rc_geometry {}
4152
}
4153
if {$cfg_geometry ne $rc_geometry} {
4154
- catch {exec git repo-config gui.geometry $cfg_geometry}
4154
+ catch {exec git config gui.geometry $cfg_geometry}
4155
}
4156
}
4157