infra/services/gnumbd/test/gnumbd_test.expected/branch_from_branch.yaml - Issue 424423004: Push pending tag and synthesized commit in a single git push operation.

Side by Side Diff: infra/services/gnumbd/test/gnumbd_test.expected/branch_from_branch.yaml

Issue 424423004: Push pending tag and synthesized commit in a single git push operation. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« infra/libs/git2/repo.py ('K') | « infra/services/gnumbd/test/gnumbd_test.expected/branch.yaml ('k') | infra/services/gnumbd/test/gnumbd_test.expected/enforce_commit_timestamps.yaml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 - - Branch 1 in place	1 - - Branch 1 in place

2 - origin:	2 - origin:

3 refs/branch-heads/cool_branch:	3 refs/branch-heads/cool_branch:

4 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:	4 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

5 - Branch commit!	5 - Branch commit!

6 - ''	6 - ''

7 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'	7 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

8 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'	8 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

9 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:	9 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

10 - Hello world	10 - Hello world

(...skipping 163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 - Base commit	174 - Base commit

175 - ''	175 - ''

176 - 'Cr-Commit-Position: refs/heads/master@{#100}'	176 - 'Cr-Commit-Position: refs/heads/master@{#100}'

177 - log output:	177 - log output:

178 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')'	178 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')'

179 - 'INFO: Ref(TestRepo(''local''), ''refs/heads/master'') is up to date'	179 - 'INFO: Ref(TestRepo(''local''), ''refs/heads/master'') is up to date'

180 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'' )'	180 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'' )'

181 - 'INFO: Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'') is up to date'	181 - 'INFO: Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch'') is up to date'

182 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch_y o'')'	182 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/branch-heads/cool_branch_y o'')'

183 - 'INFO: Pushing synthesized commit ''f449095356acf5ebca83c5f125de03849596b137 ''	183 - 'INFO: Pushing synthesized commit ''f449095356acf5ebca83c5f125de03849596b137 ''

184 for ''9212a87dfa78241acf65908f0f56bbb121471d77'''	184 for ''9212a87dfa78241acf65908f0f56bbb121471d77'' and pending_tag Ref(TestRep o(''local''),

	185 ''refs/pending-tags/branch-heads/cool_branch_yo'')'

185 - - Second pending commit now on branch	186 - - Second pending commit now on branch

186 - origin:	187 - origin:

187 refs/branch-heads/cool_branch:	188 refs/branch-heads/cool_branch:

188 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:	189 157f613ec89b70fcc2c142bd7b15d7ad98a08d86:

189 - Branch commit!	190 - Branch commit!

190 - ''	191 - ''

191 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'	192 - 'Cr-Commit-Position: refs/branch-heads/cool_branch@{#1}'

192 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'	193 - 'Cr-Branched-From: dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04-refs/heads /master@{#101}'

193 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:	194 dbe9fd0b38eb0cc1ae9d797921655d2718c2cb04:

194 - Hello world	195 - Hello world

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
293 - Base commit	294 - Base commit

294 - ''	295 - ''

295 - 'Cr-Commit-Position: refs/heads/master@{#100}'	296 - 'Cr-Commit-Position: refs/heads/master@{#100}'

296 refs/pending/heads/master:	297 refs/pending/heads/master:

297 4dac15f5702bf197eb2908203a87f43196d3789f:	298 4dac15f5702bf197eb2908203a87f43196d3789f:

298 - Hello world	299 - Hello world

299 9b00786942a531ae1510844f4ba3943cc4ca77fc:	300 9b00786942a531ae1510844f4ba3943cc4ca77fc:

300 - Base commit	301 - Base commit

301 - ''	302 - ''

302 - 'Cr-Commit-Position: refs/heads/master@{#100}'	303 - 'Cr-Commit-Position: refs/heads/master@{#100}'

OLD	NEW