[PATCH 2/3] branch: add test for -m renaming multiple config sections
- From
Sahil Dua <sahildua2305@gmail.com>
- Date
- Jun 13, 2017, 16:17 UTC
- Message-ID
- <0102015ca23f0529-c860f75d-e3bb-48b0-b2c0-502f7ab9d667-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <0102015ca23f0488-7423db93-b65f-4214-8221-af6a1bb4c2e5-000000@eu-west-1.amazonses.com>
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Add a test for how 'git branch -m' handles the renaming of multiple config sections existing for one branch.
The config format we use is hybrid machine/human editable, and we do our best to preserve the likes of comments and formatting when editing the file with git-config.
This adds a test for the currently expected semantics in the face of some rather obscure edge cases which are unlikely to occur in practice.
Helped-by: Sahil Dua <sahildua2305@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Sahil Dua <sahildua2305@gmail.com> --- t/t3200-branch.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 10f8f026ffb4b..28c02ffeadb4f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -341,6 +341,43 @@ test_expect_success 'config information was renamed, too' ' test_must_fail git config branch.s/s.dummy ' +test_expect_success 'git branch -m correctly renames multiple config sections' ' + test_when_finished "git checkout master" && + git checkout -b source master && + + # Assert that a config file with multiple config sections has + # those sections preserved... + cat >expect <<-\EOF && + branch.dest.key1=value1 + some.gar.b=age + branch.dest.key2=value2 + EOF + cat >config.branch <<\EOF && +;; Comment for source +[branch "source"] + ;; Comment for the source value + key1 = value1 + ;; Comment for some.gar +[some "gar"] + ;; Comment for the some.gar value + b = age + ;; Comment for source, again +[branch "source"] + ;; Comment for the source value, again + key2 = value2 +EOF + cat config.branch >>.git/config && + git branch -m source dest && + git config -f .git/config -l | grep -F -e source -e dest -e some.gar >actual && + test_cmp expect actual && + + # ...and that the comments for those sections are also + # preserved. + cat config.branch | sed "s/\"source\"/\"dest\"/" >expect && + grep -A 9001 "Comment for source" .git/config >actual && + test_cmp expect actual +' + test_expect_success 'deleting a symref' ' git branch target && git symbolic-ref refs/heads/symref refs/heads/target && -- https://github.com/git/git/pull/363