From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v4 4/7] remote rename/remove: handle branch.<name>.pushRemote config values
Date: Sat, 25 Jan 2020 08:29:47 +0100 [thread overview]
Message-ID: <055e52dd-9349-697c-277f-abc9ac8ae85e@googlemail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2001250142560.46@tvgsbejvaqbjf.bet>
Dear Dscho,
On 25.01.20 01:46, Johannes Schindelin wrote:
> Hi Bert,
>
> On Fri, 24 Jan 2020, Bert Wesarg wrote:
>
>> When renaming or removing a remote with
>>
>> git remote rename X Y
>> git remote remove X
>>
>> Git already renames/removes 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
>> or removes these config values from
>>
>> branch.<name>.pushRemote = X
>>
>> to
>>
>> branch.<name>.pushRemote = Y
>>
>> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>>
>> ---
>
> This commit seems to cause a failure in t5505:
> https://dev.azure.com/gitgitgadget/git/_build/results?buildId=27833&view=ms.vss-test-web.build-test-results-tab
>
> Here is the excerpt of the log:
>
> -- snip --
> [...]
> expecting success of 5505.15 'show':
> (
> cd test &&
> git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
> git fetch &&
> git checkout -b ahead origin/master &&
> echo 1 >>file &&
> test_tick &&
> git commit -m update file &&
> git checkout master &&
> git branch --track octopus origin/master &&
> git branch --track rebase origin/master &&
> git branch -d -r origin/master &&
> git config --add remote.two.url ../two &&
> git config --add remote.two.pushurl ../three &&
> git config branch.rebase.rebase true &&
> git config branch.octopus.merge "topic-a topic-b topic-c" &&
> (
> cd ../one &&
> echo 1 >file &&
> test_tick &&
> git commit -m update file
> ) &&
> git config --add remote.origin.push : &&
> git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
> git config --add remote.origin.push +refs/tags/lastbackup &&
> git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
> git config --add remote.two.push refs/heads/master:refs/heads/another &&
> git remote show origin two >output &&
> git branch -d rebase octopus &&
> test_i18ncmp expect output
> )
>
> + cd test
> + git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream
> + git fetch
> From /home/virtualbox/git/t/trash directory.t5505-remote/one
> * [new branch] master -> upstream
> + git checkout -b ahead origin/master
> Switched to a new branch 'ahead'
> Branch 'ahead' set up to track remote branch 'master' from 'origin'.
> + echo 1
> + test_tick
> + test -z
> + test_tick=1112911993
> + GIT_COMMITTER_DATE=1112911993 -0700
> + GIT_AUTHOR_DATE=1112911993 -0700
> + export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
> + git commit -m update file
> [ahead 847549e] update
> Author: A U Thor <author@example.com>
> 1 file changed, 1 insertion(+)
> + git checkout master
> Switched to branch 'master'
> Your branch is up to date with 'origin/master'.
> + git branch --track octopus origin/master
> Branch 'octopus' set up to track remote branch 'master' from 'origin'.
> + git branch --track rebase origin/master
> Branch 'rebase' set up to track remote branch 'master' from 'origin'.
> + git branch -d -r origin/master
> Deleted remote-tracking branch origin/master (was 9d34b14).
> + git config --add remote.two.url ../two
> + git config --add remote.two.pushurl ../three
> + git config branch.rebase.rebase true
> + git config branch.octopus.merge topic-a topic-b topic-c
> + cd ../one
> + echo 1
> + test_tick
> + test -z set
> + test_tick=1112912053
> + GIT_COMMITTER_DATE=1112912053 -0700
> + GIT_AUTHOR_DATE=1112912053 -0700
> + export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
> + git commit -m update file
> [master 6329a3c] update
> Author: A U Thor <author@example.com>
> 1 file changed, 1 insertion(+)
> + git config --add remote.origin.push :
> + git config --add remote.origin.push refs/heads/master:refs/heads/upstream
> + git config --add remote.origin.push +refs/tags/lastbackup
> + git config --add remote.two.push +refs/heads/ahead:refs/heads/master
> + git config --add remote.two.push refs/heads/master:refs/heads/another
> + git remote show origin two
> error: src refspec refs/tags/lastbackup does not match any
> + git branch -d rebase octopus
> Deleted branch rebase (was 9d34b14).
> Deleted branch octopus (was 9d34b14).
> + test_i18ncmp expect output
> + test_have_prereq C_LOCALE_OUTPUT
> + save_IFS=
>
> + IFS=,
> + set -- C_LOCALE_OUTPUT
> + IFS=
>
> + total_prereq=0
> + ok_prereq=0
> + missing_prereq=
> + negative_prereq=
> + total_prereq=1
> + satisfied_this_prereq=t
> + ok_prereq=1
> + test 1 = 1
> + test_cmp expect output
> + diff -u expect output
> --- expect 2020-01-25 00:44:41.496720000 +0000
> +++ output 2020-01-25 00:44:43.513861900 +0000
> @@ -5,13 +5,6 @@
> Remote branches:
> master new (next fetch will store in remotes/origin)
> side tracked
> - Local branches configured for 'git pull':
> - ahead merges with remote master
> - master merges with remote master
> - octopus merges with remote topic-a
> - and with remote topic-b
> - and with remote topic-c
> - rebase rebases onto remote master
> Local refs configured for 'git push':
> master pushes to master (local out of date)
> master pushes to upstream (create)
> error: last command exited with $?=1
> not ok 15 - show
> #
> # (
> # cd test &&
> # git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
> # git fetch &&
> # git checkout -b ahead origin/master &&
> # echo 1 >>file &&
> # test_tick &&
> # git commit -m update file &&
> # git checkout master &&
> # git branch --track octopus origin/master &&
> # git branch --track rebase origin/master &&
> # git branch -d -r origin/master &&
> # git config --add remote.two.url ../two &&
> # git config --add remote.two.pushurl ../three &&
> # git config branch.rebase.rebase true &&
> # git config branch.octopus.merge "topic-a topic-b topic-c" &&
> # (
> # cd ../one &&
> # echo 1 >file &&
> # test_tick &&
> # git commit -m update file
> # ) &&
> # git config --add remote.origin.push : &&
> # git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
> # git config --add remote.origin.push +refs/tags/lastbackup &&
> # git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
> # git config --add remote.two.push refs/heads/master:refs/heads/another &&
> # git remote show origin two >output &&
> # git branch -d rebase octopus &&
> # test_i18ncmp expect output
> # )
> #
> -- snap --
>
> Could you have a look to see whether the code or the test need to be
> adjusted?
please ensure that you have v4 of this patch. What you see was a bug in v3.
Thanks.
Bert
>
> Thanks,
> Dscho
>
next prev parent reply other threads:[~2020-01-25 7:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 9:25 [PATCH v2 0/7] remote rename/remove: improve handling of configuration values Bert Wesarg
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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=055e52dd-9349-697c-277f-abc9ac8ae85e@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).