KEMBAR78
Cygwin tools by ttaylorr · Pull Request #1965 · git-lfs/git-lfs · GitHub
Skip to content

Conversation

@ttaylorr
Copy link
Contributor

This pull-request expands on #1820 by spiking out some functions in the tools package to convert Windows paths to Cygwin paths.

This was prompted by #865 (comment), which was comparing the Windows path from os.Getwd() with the Git working dir in Cygwin format from config.LocalWorkingDir.

Since we don't have integration tests on Cygwin (though we should look into that) I'm leaving this as a [WIP] until we can verify that it works as expected.

@ttaylorr
Copy link
Contributor Author

As a side note, I'm 👍 that we can skip shelling out on non-Windows platforms, but 👎 on the tools.ConvertIfCygwin. I think that function is a bit too magical.

@ttaylorr ttaylorr mentioned this pull request Feb 20, 2017
@ttaylorr
Copy link
Contributor Author

Since we don't have integration tests on Cygwin (though we should look into that)

@sschuberth do you have any thoughts about running integration tests on Cygwin using AppVeyor?

@ttaylorr ttaylorr added the bug label Feb 20, 2017
@sschuberth
Copy link
Member

@ttaylorr I'll come up with something.

@sschuberth
Copy link
Member

@ttaylorr I've added a few commits on top of you branch in my cygwin-tools-appveyor branch. You can see the matrix build here, and also see here that the Cygwin build still fails with errors like:

--- FAIL: TestCurrentRefAndCurrentRemoteRef (3.39s)
    testutils.go:186: Error running git command 'git push -u origin master:someremotebranch': exit status 128 ssh: Could not resolve hostname c: Name or service not known
        fatal: Could not read from remote repository.
        
        Please make sure you have the correct access rights
        and the repository exists.

Feel free to cherry-pick / merge my changes as you see fit.

@ttaylorr
Copy link
Contributor Author

Feel free to cherry-pick / merge my changes as you see fit.

Thanks for taking a look at this and getting things going on AppVeyor. I went ahead and merged your branch into mine.

I'm seeing a few common failures on the Cygwin builds, so I'm going to leave those here to track:

  • git.GetTrackedFiles doesn't return results outside of the root directory.
  • testutils.RunGitCommand fails, not sure why

Those are the ones that I've been able to see so far in the Go tests. I don't quite have the time to look at those right now, but if someone else wants to, I'd much appreciate it ✨ .

@ttaylorr ttaylorr changed the title [WIP] Cygwin tools Cygwin tools Feb 28, 2017
@technoweenie technoweenie merged commit b0a61d3 into master Feb 28, 2017
@technoweenie technoweenie deleted the cygwin-tools branch February 28, 2017 22:47
@sschuberth
Copy link
Member

sschuberth commented Mar 1, 2017

I went ahead and merged your branch into mine.

I don't see the changes from my cygwin-tools-appveyor branch in there anymore. Where did they go?

@ttaylorr
Copy link
Contributor Author

ttaylorr commented Mar 1, 2017

@sschuberth, I backed out of those since they were causing the build to fail. After 2.0.0, I'd like to bring those changes back in and legitimately fix the problems on Cygwin.

@ttaylorr ttaylorr mentioned this pull request Mar 1, 2017
@sschuberth
Copy link
Member

@ttaylorr I would have been nice if you told me before, as I had deleted my local branch already, since you said to have merged it. Anyway, I was able to restore it via git reflog, and have pushed it again.

@ttaylorr
Copy link
Contributor Author

ttaylorr commented Mar 1, 2017

Anyway, I was able to restore it via git reflog, and have pushed it again.

Sorry about that, and thank you 👍

@erebel55
Copy link

erebel55 commented Mar 6, 2017

This works great, thank you! 💃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants