mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-29 10:17:16 +08:00
clone: Add some more debug statements
I cannot understand why a user has still reported a bug with it.
This commit is contained in:
@ -48,6 +48,7 @@ Future<void> cloneRemote({
|
|||||||
}
|
}
|
||||||
await repo.setUpstreamTo(remote, remoteBranchName);
|
await repo.setUpstreamTo(remote, remoteBranchName);
|
||||||
} else {
|
} else {
|
||||||
|
Log.i("Local branches $branches");
|
||||||
var branch = branches[0];
|
var branch = branches[0];
|
||||||
|
|
||||||
if (branch == remoteBranchName) {
|
if (branch == remoteBranchName) {
|
||||||
@ -56,6 +57,7 @@ Future<void> cloneRemote({
|
|||||||
await repo.setUpstreamTo(remote, remoteBranchName);
|
await repo.setUpstreamTo(remote, remoteBranchName);
|
||||||
var remoteBranch = await repo.remoteBranch(remoteName, remoteBranchName);
|
var remoteBranch = await repo.remoteBranch(remoteName, remoteBranchName);
|
||||||
if (remoteBranch != null) {
|
if (remoteBranch != null) {
|
||||||
|
Log.i("Merging '$remoteName/$remoteBranchName'");
|
||||||
await _gitRepo.merge(
|
await _gitRepo.merge(
|
||||||
branch: '$remoteName/$remoteBranchName',
|
branch: '$remoteName/$remoteBranchName',
|
||||||
authorName: authorName,
|
authorName: authorName,
|
||||||
@ -69,6 +71,8 @@ Future<void> cloneRemote({
|
|||||||
await repo.checkoutBranch(remoteBranchName, headRef.hash);
|
await repo.checkoutBranch(remoteBranchName, headRef.hash);
|
||||||
await repo.deleteBranch(branch);
|
await repo.deleteBranch(branch);
|
||||||
await repo.setUpstreamTo(remote, remoteBranchName);
|
await repo.setUpstreamTo(remote, remoteBranchName);
|
||||||
|
|
||||||
|
Log.i("Merging '$remoteName/$remoteBranchName'");
|
||||||
await _gitRepo.merge(
|
await _gitRepo.merge(
|
||||||
branch: '$remoteName/$remoteBranchName',
|
branch: '$remoteName/$remoteBranchName',
|
||||||
authorName: authorName,
|
authorName: authorName,
|
||||||
|
Reference in New Issue
Block a user