Hi Bert,
On Fri, 17 Jan 2020, Bert Wesarg wrote:
> When renaming a remote with
>
> git remote rename X Y
>
> Git already renames any config values from
>
> branch.<name>.remote = X
>
> to
>
> branch.<name>.remote = Y
>
> As branch.<name>.pushRemote also names a remote, it now also renames
> these config values from
>
> branch.<name>.pushRemote = X
>
> to
>
> branch.<name>.pushRemote = Y
Should we warn if remote.pushDefault = X?
Other than that, I am still okay with the patch (even after the
re-ordering of the enum ;-)
Just one more suggestion:
> Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
>
> ---
> Cc: Junio C Hamano <gitster@xxxxxxxxx>
> Cc: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> builtin/remote.c | 17 +++++++++++++++--
> t/t5505-remote.sh | 4 +++-
> 2 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 96bbe828fe..a74aac344f 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -251,6 +251,7 @@ struct branch_info {
> enum {
> NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE, REBASE_MERGES
> } rebase;
> + char *push_remote_name;
> };
>
> static struct string_list branch_list = STRING_LIST_INIT_NODUP;
> @@ -269,7 +270,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> char *name;
> struct string_list_item *item;
> struct branch_info *info;
> - enum { REMOTE, MERGE, REBASE } type;
> + enum { REMOTE, MERGE, REBASE, PUSH_REMOTE } type;
> size_t key_len;
>
> key += 7;
> @@ -282,6 +283,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> } else if (strip_suffix(key, ".rebase", &key_len)) {
> name = xmemdupz(key, key_len);
> type = REBASE;
> + } else if (strip_suffix(key, ".pushremote", &key_len)) {
> + name = xmemdupz(key, key_len);
> + type = PUSH_REMOTE;
> } else
> return 0;
>
> @@ -305,7 +309,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> space = strchr(value, ' ');
> }
> string_list_append(&info->merge, xstrdup(value));
> - } else {
> + } else if (type == REBASE) {
> int v = git_parse_maybe_bool(value);
> if (v >= 0)
> info->rebase = v;
> @@ -315,6 +319,10 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> info->rebase = REBASE_MERGES;
> else if (!strcmp(value, "interactive"))
> info->rebase = INTERACTIVE_REBASE;
> + } else {
> + if (info->push_remote_name)
> + warning(_("more than one %s"), orig_key);
> + info->push_remote_name = xstrdup(value);
It makes me a bit nervous that this is an `else` without an `if (type ==
PUSH_REMOTE)`... Maybe do that, just to be on the safe side, even if
another type is introduced in the future?
Thanks,
Dscho
> }
> }
> return 0;
> @@ -680,6 +688,11 @@ static int mv(int argc, const char **argv)
> strbuf_addf(&buf, "branch.%s.remote", item->string);
> git_config_set(buf.buf, rename.new_name);
> }
> + if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) {
> + strbuf_reset(&buf);
> + strbuf_addf(&buf, "branch.%s.pushremote", item->string);
> + git_config_set(buf.buf, rename.new_name);
> + }
> }
>
> if (!refspec_updated)
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index 883b32efa0..59a1681636 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -737,12 +737,14 @@ test_expect_success 'rename a remote' '
> git clone one four &&
> (
> cd four &&
> + git config branch.master.pushRemote origin &&
> git remote rename origin upstream &&
> test -z "$(git for-each-ref refs/remotes/origin)" &&
> test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
> test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
> test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
> - test "$(git config branch.master.remote)" = "upstream"
> + test "$(git config branch.master.remote)" = "upstream" &&
> + test "$(git config branch.master.pushRemote)" = "upstream"
> )
> '
>
> --
> 2.24.1.497.g9abd7b20b4.dirty
>
>
