[PATCHv3] rebase -i: respect core.abbrev for real

2015-01-22 Thread Kirill A. Shutemov
e to avoid this frustration again. The patch change code to use full 40-hex revision ids for todo actions everywhere and collapse them only to show to user. Signed-off-by: Kirill A. Shutemov --- v3: - use full 40-hex revision ids for todo actions everywhere and collapse them only to sh

[PATCHv2] rebase -i: respect core.abbrev for real

2015-01-20 Thread Kirill A. Shutemov
e to avoid this frustration again. Signed-off-by: Kirill A. Shutemov --- v2: fix &&-chain in the test-case --- git-rebase--interactive.sh| 4 ++-- t/t3404-rebase-interactive.sh | 7 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebas

[PATCH] rebase -i: respect core.abbrev for real

2015-01-19 Thread Kirill A. Shutemov
e to avoid this frustration again. Signed-off-by: Kirill A. Shutemov --- git-rebase--interactive.sh| 4 ++-- t/t3404-rebase-interactive.sh | 7 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c6a4629cbc2b..1855e12f1a

[PATCH 3/4] config: change git_config_with_options() interface

2014-02-18 Thread Kirill A. Shutemov
We're going to have more options for config source. Let's alter git_config_with_options() interface to accept struct with all source options. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 75 ++-- cache.h

[PATCH 1/4] config: disallow relative include paths from blobs

2014-02-18 Thread Kirill A. Shutemov
s wrong. Let's split that into "name" and "path" fields, use the latter for relative includes, and fill in only the former for blobs. Signed-off-by: Jeff King Signed-off-by: Kirill A. Shutemov --- config.c | 10 ++ t/t1305-config-include.

[PATCH 2/4] builtin/config.c: rename check_blob_write() -> check_write()

2014-02-18 Thread Kirill A. Shutemov
The function will be reused to check for other conditions which prevent write. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 92ebf23f0a9a..a7c55e68883c

[PATCH 4/4] config: teach "git config --file -" to read from the standard input

2014-02-18 Thread Kirill A. Shutemov
The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 11

[PATCH] config: teach "git config --file -" to read from the standard input

2014-02-16 Thread Kirill A. Shutemov
The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 11

[PATCH 1/3] builtin/config.c: rename check_blob_write() -> check_write()

2014-02-14 Thread Kirill A. Shutemov
The function will be reused to check for other conditions which prevent write. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 92ebf23f0a9a..a7c55e68883c

[PATCH 3/3] config: teach "git config --file -" to read from the standard input

2014-02-14 Thread Kirill A. Shutemov
The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 11

[PATCH 2/3] config: change git_config_with_options() interface

2014-02-14 Thread Kirill A. Shutemov
We're going to have more options for config source. Let's alter git_config_with_options() interface to accept struct with all source options. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 75 ++-- cache.h

Re: [PATCH] config: git_config_from_file(): handle "-" filename as stdin

2014-02-14 Thread Kirill A. Shutemov
On Fri, Feb 14, 2014 at 10:27:11AM -0800, Junio C Hamano wrote: > "Kirill A. Shutemov" writes: > > > The patch extends git config --file interface to allow read config from > > stdin. > > Thanks. The external interface proposed by this change that behaves &g

[PATCH] config: git_config_from_file(): handle "-" filename as stdin

2014-02-14 Thread Kirill A. Shutemov
The patch extends git config --file interface to allow read config from stdin. Signed-off-by: Kirill A. Shutemov --- config.c | 10 ++ t/t1300-repo-config.sh | 4 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config.c b/config.c index d969a5aefc2b

RE: [PATCH] rebase -i: respect to core.abbrev

2013-09-28 Thread Kirill A. Shutemov
Kirill A. Shutemov wrote: > git rebase -i collapses ids on todo list to 7 hexdigits. > Let's use core.abbrev config option instead, if it's set. > > Signed-off-by: Kirill A. Shutemov > --- > git-rebase--interactive.sh | 3 ++- > 1 file changed, 2 insertions(+),

[PATCH] rebase -i: respect to core.abbrev

2013-09-28 Thread Kirill A. Shutemov
git rebase -i collapses ids on todo list to 7 hexdigits. Let's use core.abbrev config option instead, if it's set. Signed-off-by: Kirill A. Shutemov --- git-rebase--interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/