From: Bert Wesarg <bert.wesarg@googlemail.com>
To: git@vger.kernel.org
Cc: Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH v2 0/7] remote rename/remove: improve handling of configuration values
Date: Fri, 24 Jan 2020 10:25:20 +0100 [thread overview]
Message-ID: <cover.1579857394.git.bert.wesarg@googlemail.com> (raw)
While fixing that 'git remote rename X Y' does not rename the values for
'branch.*.pushRemote', it opened the possibility to more improvements in
this area:
- 'remote rename' did not accept single-letter abbreviations for
'branch.*.rebase' like 'pull --rebase' does
- minor clean-ups the config callback
- patch 5 will be replaced by/rebased on Matthew's work in 'config: allow user to
know scope of config options', once 'config_scope_name' is available
- gently handling the rename of 'remote.pushDefault'
Changes since v1:
* avoid mixed declarations and statements
* 'git remote remove' learned similar treatment
Bert Wesarg (7):
pull --rebase/remote rename: document and honor single-letter
abbreviations rebase types
remote: clean-up by returning early to avoid one indentation
remote: clean-up config callback
remote rename/remove: handle branch.<name>.pushRemote config values
[RFC] config: make `scope_name` global as `config_scope_name`
config: provide access to the current line number
remote rename/remove: gently handle remote.pushDefault config
Documentation/config/branch.txt | 7 +-
Documentation/config/pull.txt | 7 +-
Makefile | 1 +
builtin/pull.c | 29 +----
builtin/remote.c | 188 ++++++++++++++++++++++----------
config.c | 24 ++++
config.h | 2 +
rebase.c | 35 ++++++
rebase.h | 15 +++
t/helper/test-config.c | 18 +--
t/t1308-config-set.sh | 14 ++-
t/t5505-remote.sh | 88 ++++++++++++++-
12 files changed, 322 insertions(+), 106 deletions(-)
create mode 100644 rebase.c
create mode 100644 rebase.h
--
2.24.1.497.g9abd7b20b4.dirty
next reply other threads:[~2020-01-24 9:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 9:25 Bert Wesarg [this message]
2020-01-24 9:25 ` [PATCH v2 1/7] pull --rebase/remote rename: document and honor single-letter abbreviations rebase types Bert Wesarg
2020-01-24 9:25 ` [PATCH v2 2/7] remote: clean-up by returning early to avoid one indentation Bert Wesarg
2020-01-24 9:25 ` [PATCH 3/7] remote: clean-up config callback Bert Wesarg
2020-01-24 9:25 ` [PATCH v4 4/7] remote rename/remove: handle branch.<name>.pushRemote config values Bert Wesarg
2020-01-25 0:46 ` Johannes Schindelin
2020-01-25 7:29 ` Bert Wesarg
2020-01-26 9:30 ` Johannes Schindelin
2020-01-24 9:25 ` [RFC PATCH 5/7] config: make `scope_name` global as `config_scope_name` Bert Wesarg
2020-01-24 9:25 ` [PATCH 6/7] config: provide access to the current line number Bert Wesarg
2020-01-24 9:25 ` [PATCH v2 7/7] remote rename/remove: gently handle remote.pushDefault config Bert Wesarg
2020-01-24 21:00 ` [PATCH v2 0/7] remote rename/remove: improve handling of configuration values Junio C Hamano
2020-01-25 0:39 ` Matt Rogers
2020-01-27 6:50 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1579857394.git.bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.