From: Bert Wesarg <bert.wesarg@googlemail.com>
To: git@vger.kernel.org
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/7] remote rename: improve handling of configuration values
Date: Tue, 21 Jan 2020 10:24:48 +0100 [thread overview]
Message-ID: <cover.1579598053.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'
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: rename branch.<name>.pushRemote config values too
[RFC] config: make `scope_name` global as `config_scope_name`
config: provide access to the current line number
remote rename: gently handle remote.pushDefault config
Documentation/config/branch.txt | 7 +-
Documentation/config/pull.txt | 7 +-
Makefile | 1 +
builtin/pull.c | 29 +-----
builtin/remote.c | 168 +++++++++++++++++++++-----------
config.c | 24 +++++
config.h | 2 +
rebase.c | 24 +++++
rebase.h | 15 +++
t/helper/test-config.c | 18 +---
t/t1308-config-set.sh | 14 ++-
t/t5505-remote.sh | 52 +++++++++-
12 files changed, 254 insertions(+), 107 deletions(-)
create mode 100644 rebase.c
create mode 100644 rebase.h
--
2.24.1.497.g9abd7b20b4.dirty
next prev reply other threads:[~2020-01-21 9:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 21:25 [PATCH] remote: rename also remotes in the branch.<name>.pushRemote config Bert Wesarg
2020-01-16 23:14 ` Junio C Hamano
2020-01-17 9:33 ` [PATCH v2] remote rename: rename branch.<name>.pushRemote config values too Bert Wesarg
2020-01-17 11:50 ` Johannes Schindelin
2020-01-17 12:37 ` Bert Wesarg
2020-01-17 13:30 ` Johannes Schindelin
2020-01-17 14:40 ` Bert Wesarg
2020-01-20 11:25 ` Johannes Schindelin
2020-01-20 13:14 ` Bert Wesarg
2020-01-20 13:51 ` Johannes Schindelin
2020-01-17 18:48 ` Junio C Hamano
2020-01-17 20:20 ` Bert Wesarg
2020-01-17 21:24 ` Junio C Hamano
2020-01-21 9:24 ` Bert Wesarg [this message]
2020-01-21 9:24 ` [PATCH 1/7] pull --rebase/remote rename: document and honor single-letter abbreviations rebase types Bert Wesarg
2020-01-21 23:26 ` Junio C Hamano
2020-01-22 7:34 ` Bert Wesarg
2020-01-22 19:43 ` Junio C Hamano
2020-01-21 9:24 ` [PATCH 2/7] remote: clean-up by returning early to avoid one indentation Bert Wesarg
2020-01-23 23:02 ` Junio C Hamano
2020-01-21 9:24 ` [PATCH 3/7] remote: clean-up config callback Bert Wesarg
2020-01-21 9:24 ` [PATCH v3 4/7] remote rename: rename branch.<name>.pushRemote config values too Bert Wesarg
2020-01-21 9:24 ` [PATCH 5/7] [RFC] config: make `scope_name` global as `config_scope_name` Bert Wesarg
2020-01-22 0:12 ` Matt Rogers
2020-01-22 7:37 ` Bert Wesarg
2020-01-23 1:30 ` Matt Rogers
2020-01-21 9:24 ` [PATCH 6/7] config: provide access to the current line number Bert Wesarg
2020-01-21 9:24 ` [PATCH 7/7] remote rename: gently handle remote.pushDefault config Bert Wesarg
2020-01-23 23:03 ` Junio C Hamano
2020-01-24 8:49 ` Bert Wesarg
2020-01-22 15:26 ` [PATCH 0/7] remote rename: improve handling of configuration values Bert Wesarg
2020-01-17 9:49 ` [PATCH] remote: rename also remotes in the branch.<name>.pushRemote config Johannes Schindelin
2020-01-17 9:45 ` Johannes Schindelin
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.1579598053.git.bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).