Merge libfuse/sshfs

[jmmv]

All the changes in osxfuse/sshfs, and some additional cleanups, have been merged into libfuse/sshfs. It would be nice now to merge them back into osxfuse/sshfs or to drop this repository altogether.

The merge is easy: osxfuse/sshfs can be fast-forwarded to match osxfuse/sshfs.

What would be nice though, if you want to keep this repository, is to have it marked as a fork of libfuse/sshfs in GitHub so the relation between the two is clear. I don't know if this is possible without recreating the repository... which has its own problems (like losing the bug tracker).

So is there a reason to keep this in osxfuse?

[bfleischer]

Thanks for all your work. I've fast-forwarded osxfuse/sshfs.

So is there a reason to keep this in osxfuse?

I need a way to distribute binary releases and would like to retain at least some control of the repository, like being able to push commits to address OS X specific issues.

However, right now my main focus lies on the osxfuse kernel extension.

[jmmv]

Sounds fair, but could you maybe add a note to README.md saying that this is a "fork" of libfuse/sshfs and that commits should be sent there, either directly or via a pull request from osxfuse/sshfs? Would be nice if your fixes for OS X specific issues were not isolated to this repository.

[Nikratio]

I wouldn't have a problem to add you as a committer to libfuse/sshfs if that helps. I also think that the current situation is a bit unfortunate (e.g. I would really like to see things like https://github.com/osxfuse/sshfs/commit/5c0dbfe in the "main" sshfs, yet I only stumble upon them by chance).

[bfleischer]

I'm not too happy about the current situation either:

• Currently I have no place to push macOS specific commits but osxfuse/sshfs
• I have no place to upload static builds. In order to be able to release a static build (containing a fix like 5c0dbfe3eb40100f9277e863926f2e7d7c9a5a4c) I would need to create a new tag in osxfuse/sshfs which would not be in sync with official releases in libfuse/sshfs and the builds distributed by package managers like MacPorts and Homebrew.
• I'm not involved in release planning. Will there be another SSHFS 2.x bugfix release? SSHFS 3.x will not work on macOS until libfuse3 is ported.
• Several of the sshfs issues reported in the osxfuse issue tracker are most likely not caused by osxfuse. In particular I'm not convinced that osxfuse/osxfuse#381 is caused by osxfuse. It would be great if somebody who knows the ins and outs of sshfs could assess issues like that.

Basically I think there are three options:

• I delete the osxfuse/sshfs repository and refer all sshfs related bug reports, that are not obviously caused by osxfuse, to libfuse/sshfs. In this scenario I would no longer provide compatibility patches for macOS or static builds. I'm not sure who would take over, though. The two commits from four days ago, you are referring to (5c0dbfe3eb40100f9277e863926f2e7d7c9a5a4c and f187961c7a6a2433c8af7e758d8185568d8006a2), fix issues that have existed for almost a year.
• You could make me a member of the libfuse organization. This would allow me to push macOS specific commits and upload static builds for macOS to the official sshfs repository. Like I said before my main focus lies on FUSE itself, so I would not get in your way. I think in this scenario it would be best to delete osxfuse/sshfs, too.
• We keep the status quo.

It all comes down to this: I would like to be able to push commits to the official macOS sshfs repository like I have been doing before you merged the macOS specific modifications info libfuse/sshfs. If that repository ends up to be libfuse/sshfs that's fine by me.

[Nikratio]

Well, then let's go with option (2) :-).

[bfleischer]

Well, then let's go with option (2) :-).

Thanks for the invite. So, how do you want to proceed? Judging from the recent activity on the sshfs_2.x branch I assume there will be a 2.10 release. Is this correct? If so I will add 5c0dbfe and f187961 to the sshfs_2.x branch.

[Nikratio]

Let's have further discussions on the sshfs mailing list if that's ok with you. That's easier to find & search for than an issue in the osxfuse issue tracker :-). If you haven't already, then you you can subscribe at https://lists.sourceforge.net/lists/listinfo/fuse-sshfs.

[Nikratio]

Let me know when you're subscribed, and then sent I'll email with future plans and we can discuss how to best integrate/identify anything that's in this repo but not the other.

[bfleischer]

I'm subscribed.

[Nikratio]

Sorry for the delay, just send on email to the list.