mirror of
https://github.com/git/git
synced 2024-07-05 00:58:49 +00:00
Rename git-config-set to git-repo-config
... and adjust all references. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
Junio C Hamano
parent
a50b870aa1
commit
ee72aeaf00
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -17,7 +17,6 @@ git-clone
|
|||
git-clone-pack
|
||||
git-commit
|
||||
git-commit-tree
|
||||
git-config-set
|
||||
git-convert-objects
|
||||
git-count-objects
|
||||
git-cvsexportcommit
|
||||
|
|
@ -76,6 +75,7 @@ git-rebase
|
|||
git-receive-pack
|
||||
git-relink
|
||||
git-repack
|
||||
git-repo-config
|
||||
git-request-pull
|
||||
git-reset
|
||||
git-resolve
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
git-config-set(1)
|
||||
===============
|
||||
git-repo-config(1)
|
||||
==================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-config-set - Set options in .git/config.
|
||||
git-repo-config - Get and set options in .git/config.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-config-set' name [value [value_regex]]
|
||||
'git-config-set' --replace-all name [value [value_regex]]
|
||||
'git-config-set' --get name [value_regex]
|
||||
'git-config-set' --get-all name [value_regex]
|
||||
'git-config-set' --unset name [value_regex]
|
||||
'git-config-set' --unset-all name [value_regex]
|
||||
'git-repo-config' name [value [value_regex]]
|
||||
'git-repo-config' --replace-all name [value [value_regex]]
|
||||
'git-repo-config' --get name [value_regex]
|
||||
'git-repo-config' --get-all name [value_regex]
|
||||
'git-repo-config' --unset name [value_regex]
|
||||
'git-repo-config' --unset-all name [value_regex]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -89,7 +89,7 @@ Given a .git/config like this:
|
|||
you can set the filemode to true with
|
||||
|
||||
------------
|
||||
% git config-set core.filemode true
|
||||
% git repo-config core.filemode true
|
||||
------------
|
||||
|
||||
The hypothetic proxy command entries actually have a postfix to discern
|
||||
|
|
@ -97,7 +97,7 @@ to what URL they apply. Here is how to change the entry for kernel.org
|
|||
to "ssh".
|
||||
|
||||
------------
|
||||
% git config-set proxy.command '"ssh" for kernel.org' 'for kernel.org$'
|
||||
% git repo-config proxy.command '"ssh" for kernel.org' 'for kernel.org$'
|
||||
------------
|
||||
|
||||
This makes sure that only the key/value pair for kernel.org is replaced.
|
||||
|
|
@ -105,7 +105,7 @@ This makes sure that only the key/value pair for kernel.org is replaced.
|
|||
To delete the entry for renames, do
|
||||
|
||||
------------
|
||||
% git config-set --unset diff.renames
|
||||
% git repo-config --unset diff.renames
|
||||
------------
|
||||
|
||||
If you want to delete an entry for a multivar (like proxy.command above),
|
||||
|
|
@ -114,45 +114,45 @@ you have to provide a regex matching the value of exactly one line.
|
|||
To query the value for a given key, do
|
||||
|
||||
------------
|
||||
% git config-set --get core.filemode
|
||||
% git repo-config --get core.filemode
|
||||
------------
|
||||
|
||||
or
|
||||
|
||||
------------
|
||||
% git config-set core.filemode
|
||||
% git repo-config core.filemode
|
||||
------------
|
||||
|
||||
or, to query a multivar:
|
||||
|
||||
------------
|
||||
% git config-set --get proxy.command "for kernel.org$"
|
||||
% git repo-config --get proxy.command "for kernel.org$"
|
||||
------------
|
||||
|
||||
If you want to know all the values for a multivar, do:
|
||||
|
||||
------------
|
||||
% git config-set --get-all proxy.command
|
||||
% git repo-config --get-all proxy.command
|
||||
------------
|
||||
|
||||
If you like to live dangerous, you can replace *all* proxy.commands by a
|
||||
new one with
|
||||
|
||||
------------
|
||||
% git config-set --replace-all proxy.command ssh
|
||||
% git repo-config --replace-all proxy.command ssh
|
||||
------------
|
||||
|
||||
However, if you really only want to replace the line for the default proxy,
|
||||
i.e. the one without a "for ..." postfix, do something like this:
|
||||
|
||||
------------
|
||||
% git config-set proxy.command ssh '! for '
|
||||
% git repo-config proxy.command ssh '! for '
|
||||
------------
|
||||
|
||||
To actually match only values with an exclamation mark, you have to
|
||||
|
||||
------------
|
||||
% git config-set section.key value '[!]'
|
||||
% git repo-config section.key value '[!]'
|
||||
------------
|
||||
|
||||
|
||||
|
|
@ -84,9 +84,6 @@ gitlink:git-checkout-index[1]::
|
|||
gitlink:git-commit-tree[1]::
|
||||
Creates a new commit object
|
||||
|
||||
gitlink:git-config-set[1]::
|
||||
Set options in .git/config.
|
||||
|
||||
gitlink:git-hash-object[1]::
|
||||
Computes the object ID from a file.
|
||||
|
||||
|
|
@ -111,6 +108,9 @@ gitlink:git-prune-packed[1]::
|
|||
gitlink:git-read-tree[1]::
|
||||
Reads tree information into the directory index
|
||||
|
||||
gitlink:git-repo-config[1]::
|
||||
Get and set options in .git/config.
|
||||
|
||||
gitlink:git-unpack-objects[1]::
|
||||
Unpacks objects out of a packed archive.
|
||||
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -130,7 +130,7 @@ PROGRAMS = \
|
|||
git-unpack-objects$X git-update-index$X git-update-server-info$X \
|
||||
git-upload-pack$X git-verify-pack$X git-write-tree$X \
|
||||
git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
|
||||
git-name-rev$X git-pack-redundant$X git-config-set$X git-var$X
|
||||
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X
|
||||
|
||||
# what 'all' will build and 'install' will install.
|
||||
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) git$X
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include <regex.h>
|
||||
|
||||
static const char git_config_set_usage[] =
|
||||
"git-config-set [--get | --get-all | --replace-all | --unset | --unset-all] name [value [value_regex]]";
|
||||
"git-repo-config [--get | --get-all | --replace-all | --unset | --unset-all] name [value [value_regex]]";
|
||||
|
||||
static char* key = NULL;
|
||||
static char* value = NULL;
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
# Copyright (c) 2005 Johannes Schindelin
|
||||
#
|
||||
|
||||
test_description='Test git-config-set in different settings'
|
||||
test_description='Test git-repo-config in different settings'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test -f .git/config && rm .git/config
|
||||
|
||||
git-config-set core.penguin "little blue"
|
||||
git-repo-config core.penguin "little blue"
|
||||
|
||||
cat > expect << EOF
|
||||
#
|
||||
|
|
@ -22,7 +22,7 @@ EOF
|
|||
|
||||
test_expect_success 'initial' 'cmp .git/config expect'
|
||||
|
||||
git-config-set Core.Movie BadPhysics
|
||||
git-repo-config Core.Movie BadPhysics
|
||||
|
||||
cat > expect << EOF
|
||||
#
|
||||
|
|
@ -36,7 +36,7 @@ EOF
|
|||
|
||||
test_expect_success 'mixed case' 'cmp .git/config expect'
|
||||
|
||||
git-config-set Cores.WhatEver Second
|
||||
git-repo-config Cores.WhatEver Second
|
||||
|
||||
cat > expect << EOF
|
||||
#
|
||||
|
|
@ -52,7 +52,7 @@ EOF
|
|||
|
||||
test_expect_success 'similar section' 'cmp .git/config expect'
|
||||
|
||||
git-config-set CORE.UPPERCASE true
|
||||
git-repo-config CORE.UPPERCASE true
|
||||
|
||||
cat > expect << EOF
|
||||
#
|
||||
|
|
@ -70,10 +70,10 @@ EOF
|
|||
test_expect_success 'similar section' 'cmp .git/config expect'
|
||||
|
||||
test_expect_success 'replace with non-match' \
|
||||
'git-config-set core.penguin kingpin !blue'
|
||||
'git-repo-config core.penguin kingpin !blue'
|
||||
|
||||
test_expect_success 'replace with non-match (actually matching)' \
|
||||
'git-config-set core.penguin "very blue" !kingpin'
|
||||
'git-repo-config core.penguin "very blue" !kingpin'
|
||||
|
||||
cat > expect << EOF
|
||||
#
|
||||
|
|
@ -106,7 +106,7 @@ EOF
|
|||
cp .git/config .git/config2
|
||||
|
||||
test_expect_success 'multiple unset' \
|
||||
'git-config-set --unset-all beta.haha'
|
||||
'git-repo-config --unset-all beta.haha'
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -122,7 +122,7 @@ test_expect_success 'multiple unset is correct' 'cmp .git/config expect'
|
|||
mv .git/config2 .git/config
|
||||
|
||||
test_expect_success '--replace-all' \
|
||||
'git-config-set --replace-all beta.haha gamma'
|
||||
'git-repo-config --replace-all beta.haha gamma'
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -136,7 +136,7 @@ EOF
|
|||
|
||||
test_expect_success 'all replaced' 'cmp .git/config expect'
|
||||
|
||||
git-config-set beta.haha alpha
|
||||
git-repo-config beta.haha alpha
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -150,7 +150,7 @@ EOF
|
|||
|
||||
test_expect_success 'really mean test' 'cmp .git/config expect'
|
||||
|
||||
git-config-set nextsection.nonewline wow
|
||||
git-repo-config nextsection.nonewline wow
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -165,8 +165,8 @@ EOF
|
|||
|
||||
test_expect_success 'really really mean test' 'cmp .git/config expect'
|
||||
|
||||
test_expect_success 'get value' 'test alpha = $(git-config-set beta.haha)'
|
||||
git-config-set --unset beta.haha
|
||||
test_expect_success 'get value' 'test alpha = $(git-repo-config beta.haha)'
|
||||
git-repo-config --unset beta.haha
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -180,7 +180,7 @@ EOF
|
|||
|
||||
test_expect_success 'unset' 'cmp .git/config expect'
|
||||
|
||||
git-config-set nextsection.NoNewLine "wow2 for me" "for me$"
|
||||
git-repo-config nextsection.NoNewLine "wow2 for me" "for me$"
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -196,18 +196,18 @@ EOF
|
|||
test_expect_success 'multivar' 'cmp .git/config expect'
|
||||
|
||||
test_expect_success 'non-match' \
|
||||
'git-config-set --get nextsection.nonewline !for'
|
||||
'git-repo-config --get nextsection.nonewline !for'
|
||||
|
||||
test_expect_success 'non-match value' \
|
||||
'test wow = $(git-config-set --get nextsection.nonewline !for)'
|
||||
'test wow = $(git-repo-config --get nextsection.nonewline !for)'
|
||||
|
||||
test_expect_failure 'ambiguous get' \
|
||||
'git-config-set --get nextsection.nonewline'
|
||||
'git-repo-config --get nextsection.nonewline'
|
||||
|
||||
test_expect_success 'get multivar' \
|
||||
'git-config-set --get-all nextsection.nonewline'
|
||||
'git-repo-config --get-all nextsection.nonewline'
|
||||
|
||||
git-config-set nextsection.nonewline "wow3" "wow$"
|
||||
git-repo-config nextsection.nonewline "wow3" "wow$"
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -222,15 +222,15 @@ EOF
|
|||
|
||||
test_expect_success 'multivar replace' 'cmp .git/config expect'
|
||||
|
||||
test_expect_failure 'ambiguous value' 'git-config-set nextsection.nonewline'
|
||||
test_expect_failure 'ambiguous value' 'git-repo-config nextsection.nonewline'
|
||||
|
||||
test_expect_failure 'ambiguous unset' \
|
||||
'git-config-set --unset nextsection.nonewline'
|
||||
'git-repo-config --unset nextsection.nonewline'
|
||||
|
||||
test_expect_failure 'invalid unset' \
|
||||
'git-config-set --unset somesection.nonewline'
|
||||
'git-repo-config --unset somesection.nonewline'
|
||||
|
||||
git-config-set --unset nextsection.nonewline "wow3$"
|
||||
git-repo-config --unset nextsection.nonewline "wow3$"
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
|
|
@ -244,12 +244,12 @@ EOF
|
|||
|
||||
test_expect_success 'multivar unset' 'cmp .git/config expect'
|
||||
|
||||
test_expect_failure 'invalid key' 'git-config-set inval.2key blabla'
|
||||
test_expect_failure 'invalid key' 'git-repo-config inval.2key blabla'
|
||||
|
||||
test_expect_success 'correct key' 'git-config-set 123456.a123 987'
|
||||
test_expect_success 'correct key' 'git-repo-config 123456.a123 987'
|
||||
|
||||
test_expect_success 'hierarchical section' \
|
||||
'git-config-set 1.2.3.alpha beta'
|
||||
'git-repo-config 1.2.3.alpha beta'
|
||||
|
||||
cat > expect << EOF
|
||||
[beta] ; silly comment # another comment
|
||||
Loading…
Reference in New Issue
Block a user