It would be even better for me if unite had the ability to determine casing from a branch in git instead of the local filesystem.

In my workplace our only “official” repository is TFS. I use git-tf (from Microsoft) to initially clone TFS repositories to git, and fetch periodically to keep my git repositories up to date.

The latest TFS shows up as a remote branch origin_tfs/tfs.

I do all of my work on a different branch and periodically merging from the origin_tfs/tfs into my local branch.

When I have changes to go back to TFS, I push to a shelve set in TFS, then merge to TFS from there.

It causes grief when casing is changed in the TFS repository.

If I could base casing on the origin_tfs/tfs branch it should eliminate most if not all of my issues. I’ve been looking at the git-unite sources (well done) and may take it on myself, but I have a bit of a learning curve on libgit2 to get over first.

]]>Comment on How-To Fork Git Repositories on Visual Studio Online by Joshua Hoffmanhttp://www.woodcp.com/2014/01/how-to-fork-git-repositories-on-visual-studio-online/#comment-81
Wed, 22 Oct 2014 00:26:00 +0000http://www.woodcp.com/?p=134#comment-81Is there a convenient way to get VS to stop trying to push changes to the upstream repo?

Ideally I’d like to maintain the ability to push upstream if I choose to (even if it has to be via git bash or another tool), but I’d like to get back the functionality where the “sync” button only pushes to my origin repo and not my upstream.

So far the best I’ve been able to come up with is manually adding and removing the upstream (or maybe making an alias or script that does so and running it via git bash)

EDIT: In my case, the upstream is an internal core libraries repo which I do have access rights to and may have occasion to change.

]]>Comment on How-To Fork Git Repositories on Visual Studio Online by Rainabbahttp://www.woodcp.com/2014/01/how-to-fork-git-repositories-on-visual-studio-online/#comment-80
Tue, 07 Oct 2014 07:38:00 +0000http://www.woodcp.com/?p=134#comment-80Thanks for the article. As I got going I learned a few things and took another route that I wanted to share if only to learn why it’s not a good way to go

Sorry if that’s not clear enough, but basically, you use git subtree split to take ANY folder presently in a repo and create a branch that’s filtered to have just that folder and all the history for it. Then you create a bare repo, push the branch into it, then push that repo (without working folder) to your new repo, then either trash the folder or clone the repo into another one and BAM, you’ve forked not only an existing repo, but just one folder in it if you prefer (I had many “projects” in one repo that needed to be forked individually so this was useful for me) and history stays intact.

]]>Comment on How-To Fork Git Repositories on Visual Studio Online by Todd A. Woodhttp://www.woodcp.com/2014/01/how-to-fork-git-repositories-on-visual-studio-online/#comment-79
Thu, 10 Jul 2014 15:30:00 +0000http://www.woodcp.com/?p=134#comment-79Since your repositories share a common ancestor, you should be able to just set an upstream remote in vsorchard to orchardsource. You can then fetch the upstream changes and merge into your vsorchard clone (fork).
]]>Comment on How-To Fork Git Repositories on Visual Studio Online by Robert Martinezhttp://www.woodcp.com/2014/01/how-to-fork-git-repositories-on-visual-studio-online/#comment-78
Thu, 10 Jul 2014 15:16:00 +0000http://www.woodcp.com/?p=134#comment-78Would something like this work if I want to work from a branch of an opens source project like Orchard CMS? I wasn’t originally sure what to do (before I found this article), so several months ago I created a clone on my local machine (say c:/orchardsource/). I then just “copied” over to a VS directory I created (say c:/vsorchard/). This is what I use for VS online. I knew this would be a problem later on, and it was because the original I cloned was version 1.8, and version 1.8.1 just came out.
Now, I could just update the c:/orchardsource/ and use something like WinMerge to copy over new or updated files to c:/vsorchard (and then subsequently push those up to VS online), but that seems unecessary. Thanks in advance for any insight.
]]>