Skip to content

Can't pull after cloning an empty repository#4575

Closed
agisilaos wants to merge 14 commits intodesktop:masterfrom
agisilaos:agis/pull-an-empty-repo-is-weird
Closed

Can't pull after cloning an empty repository#4575
agisilaos wants to merge 14 commits intodesktop:masterfrom
agisilaos:agis/pull-an-empty-repo-is-weird

Conversation

@agisilaos
Copy link
Member

@agisilaos agisilaos commented May 2, 2018 •
edited
Loading

Fixes: #4574

I followed @shiftkey's advice and implemented his rough patch for fixing this issue. One of his comments though was:

This feels suboptimal because we're repeating the same check in a few places, but that's a side-effect of how the component is currently organized. But that should be a starting point for someone to dig into.

Note: Maybe we can change some things about how this component is organized so we don't repeat the same check as much? I'm open to suggestions.

@agisilaos
Copy link
Member Author

agisilaos commented May 2, 2018

🍅

@iAmWillShepherd iAmWillShepherd added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 2, 2018
@agisilaos
Copy link
Member Author

agisilaos commented May 9, 2018

Hmm, can't access VSTS logs to see why build's failing.. As I can see also the build on master is failing as well. Super weird. 🤔 Any ideas what may be happening? @iAmWillShepherd

@shiftkey
Copy link
Member

shiftkey commented May 9, 2018 •
edited
Loading

Hmm, can't access VSTS logs to see why build's failing..

@agisilaos that build was from before we gained access to public projects, and the actual error was because forks were not building at the time. This should all be fine now.

@shiftkey
Copy link
Member

shiftkey commented May 11, 2018

@agisilaos I think the submodules changes need to be reverted to whatever is currently on master

@agisilaos
Copy link
Member Author

agisilaos commented May 11, 2018

Hm, what you mean @shiftkey?

@shiftkey
Copy link
Member

shiftkey commented May 11, 2018

@agisilaos this reads to me as a merge gone awry:

~/src/desktop/ git log -p -n 2 -- app/static/common/gitignore
commit d914f8cdb46bc9e023eda37d1164e9ede7a2f4ab
Author: agisilaos <tsaras96@yahoo.gr>
Date:   Wed May 9 15:59:13 2018 +0300

    🤔

diff --git a/app/static/common/gitignore b/app/static/common/gitignore
index 18e28746b..690a433b6 160000
--- a/app/static/common/gitignore
+++ b/app/static/common/gitignore
@@ -1 +1 @@
-Subproject commit 18e28746b0862059dbee8694fd366a679cb812fb
+Subproject commit 690a433b668348c33087d34fafe2155ebe8bb4cf

commit 07316cfcd11df395445d3ed7c31bc7f47e486277
Author: Brendan Forster <github@brendanforster.com>
Date:   Fri May 4 12:24:25 2018 +1000

    update submodules to get new changes

diff --git a/app/static/common/gitignore b/app/static/common/gitignore
index 690a433b6..18e28746b 160000
--- a/app/static/common/gitignore
+++ b/app/static/common/gitignore
@@ -1 +1 @@
-Subproject commit 690a433b668348c33087d34fafe2155ebe8bb4cf
+Subproject commit 18e28746b0862059dbee8694fd366a679cb812fb

@agisilaos
Copy link
Member Author

agisilaos commented May 16, 2018

@shiftkey Will create a fresh pr because I'm not sure what's exactly happening here.

@agisilaos agisilaos closed this May 16, 2018
@lock lock bot locked as resolved and limited conversation to collaborators Jul 17, 2018
@desktop desktop unlocked this conversation Sep 27, 2018
@jackfreem jackfreem mentioned this pull request Jan 28, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@nextGZ nextGZ nextGZ approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@agisilaos @shiftkey @nextGZ @iAmWillShepherd