Commit fdaf076

committed

apps/svn2git-vbox: Fix order of author and committer lines for the commit fast-import command, author needs to come before committer, bugref:10900

svn:sync-xref-src-repo-rev: r171252

1 parent f8fa195 commit fdaf076Copy full SHA for fdaf076

File tree

-5

lines changed

-5

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: git.cpp 110524 2025-08-04 09:36:44Z alexander.eichner@oracle.com $ */`
	`1`	`+/* $Id: git.cpp 111660 2025-11-12 11:58:30Z alexander.eichner@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* svn2git - Convert a svn repository to git.`
`4`	`4`	`*/`
`@@ -792,14 +792,16 @@ DECLHIDDEN(int) s2gGitTransactionCommit(S2GREPOSITORYGIT hGitRepo, const char *p`
`792`	`792`	`uint64_t const idMark = pThis->idCommitMark++;`
`793`	`793`	`int rc = s2gScratchBufPrintf(&pThis->BufScratch,`
`794`	`794`	`"commit refs/heads/%s\n"`
`795`		`- "mark :%RU64\n"`
`796`		`- "committer %s <%s> %RI64 +0000\n",`
`797`		`- pszBranch, idMark,`
`798`		`- pszCommitter, pszCommitterEmail, cEpochSecs);`
	`795`	`+ "mark :%RU64\n",`
	`796`	`+ pszBranch, idMark);`
`799`	`797`	`if (RT_SUCCESS(rc) && pszAuthor && pszAuthorEmail)`
`800`	`798`	`rc = s2gScratchBufPrintf(&pThis->BufScratch,`
`801`	`799`	`"author %s <%s> %RI64 +0000\n",`
`802`	`800`	`pszAuthor, pszAuthorEmail, cEpochSecs);`
	`801`	`+ if (RT_SUCCESS(rc))`
	`802`	`+ rc = s2gScratchBufPrintf(&pThis->BufScratch,`
	`803`	`+ "committer %s <%s> %RI64 +0000\n",`
	`804`	`+ pszCommitter, pszCommitterEmail, cEpochSecs);`
`803`	`805`	`if (RT_SUCCESS(rc))`
`804`	`806`	`rc = s2gScratchBufPrintf(&pThis->BufScratch,`
`805`	`807`	`"data %zu\n"`

Comments

(0)