make "port sync" git - aware

[andy@…]

please let "port sync" detect a ".git"-macports repo instead of a subversion repository.

patch attached.

[ecronin@…]

I just switched to a local git-svn repo and would like to see this too...

Attaching a new patch that adds a couple more features:

• checking for $portdir/../.git is brittle, a better check is to run cd $portdir && git rev-parse --is-inside-work-tree 2>/dev/null >/dev/null which doesn't depend on a particular layout of the repository
• the 'update' command is different for raw git versus git-svn so check which type the working-dir is and use the right one

[ecronin@…]

This needs some more work to match the behavior of svn. git pull and git svn fetch only bring the remote changes to the local repo, they don't apply them to the working copy for MacPorts to see... A git rebase or git svn rebase is also needed, likely surrounded by a git stash save/git stash pop combo and some error checking to clean up a failed merge...

Right now this patch is a slightly fancy NOOP from port sync's standpoint since the working tree doesn't change and no new updates get indexed.

[ecronin@…]

updated patch to rebase git-svn repos

[ecronin@…]

The change to .svn detection recently committed stopped my previous patch from applying cleanly, here's a new version which always includes the git stash save/pop step (I was incorrect in comment 3 I believe, a pull does a merge which should update the working directory)

I only test the git-svn half of the patch, but it has worked fine for 10 months now, blowing up a bit when manual intervention is needed because rebase or git stash pop has conflicts (I assume a failed svn update has the same issues on a dirty working directory), fixing the conflict and running selfupdate again is all that's needed

[ecronin@…]

r92410 does this for clean git repos, doesn't look like it handles git-svn or stashing any local modifications before trying to rebase

[nonstop.server@…]

Cc Me!

[michael.klein@…]

Cc Me!

[michael.klein@…]

I have two concerns regarding r92410:

• it only works if $portdir is the repository root directory, so it doesn't even work for git://git.macports.org/macports/trunk.git, where $portdir is in dports
• it does a git pull --rebase. See ​http://git-scm.com/book/ch3-6.html#The-Perils-of-Rebasing how this can cause trouble. If one really wants to rebase, one can use git config --local pull.rebase true instead

So, can we have 0001-Add-support-for-git-managed-portdirs.patch applied instead, but without git stash save/pop? If there are no local modifications, git stash save doesn't seem to save anything, and the following git stash pop fails. IMO is't perfectly ok to have the user commit any modifications before syncing.

[egall@…]

Cc Me!