[MacPorts] #27485: make "port sync" git - aware
MacPorts
noreply at macports.org
Fri Oct 12 13:07:31 PDT 2012
#27485: make "port sync" git - aware
--------------------------+---------------------------------------------
Reporter: andy@… | Owner: macports-tickets@…
Type: enhancement | Status: new
Priority: Normal | Milestone:
Component: base | Version: 1.9.2
Resolution: | Keywords: git, subversion, sync, haspatch
Port: |
--------------------------+---------------------------------------------
Comment (by 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.
--
Ticket URL: <https://trac.macports.org/ticket/27485#comment:7>
MacPorts <http://www.macports.org/>
Ports system for Mac OS
More information about the macports-tickets
mailing list