This seems to work as advertised now (only that when I run `git branch` directly after running git-ffwd, git tells me I'm on branch "(no branch)". Checking out my forwarded branch makes this go away and everything looks sane).
Also, I installed git 1.6.4.4 from http://code.google.com/p/git-osx-installer/ , and `git cl dcommit` now seems to work without problems. Hooray! Nico On Fri, Sep 18, 2009 at 2:05 PM, Evan Martin <[email protected]> wrote: > Fixed, please pull. (Apparently they updated the manpage in a later > version to reflect how to work around this, but I looked at the > manpage on the older computer...) > > On Fri, Sep 18, 2009 at 1:40 PM, Nico Weber <[email protected]> wrote: >> $ ../../depot_tools/git-ffwd/git-ffwd ext >> ../../depot_tools/git-ffwd/git-ffwd: line 5: git-sh-setup: No such >> file or directory >> $find ../../depot_tools -name git-sh-setup >> $ >> >> On Fri, Sep 18, 2009 at 1:33 PM, Evan Martin <[email protected]> wrote: >>> Sorry, that original version didn't quite work. Pushed a new one that >>> now includes a basic test. >>> >>> On Fri, Sep 18, 2009 at 12:51 PM, Evan Martin <[email protected]> wrote: >>>> git clone git://neugierig.org/git-ffwd.git >>>> >>>> Usage: >>>> git checkout origin >>>> git ffwd branchname >>>> Aborts on any conflicts. >>>> Patches welcome (some TODOs are in the code). >>>> >>>> On Fri, Sep 18, 2009 at 11:47 AM, Eric Seidel <[email protected]> wrote: >>>>> For my use case: If there is more than one commit on a branch, then >>>>> that is intentional history on my part. :) So yes. >>>>> >>>>> -eric >>>>> >>>>> On Fri, Sep 18, 2009 at 11:45 AM, Nico Weber <[email protected]> wrote: >>>>>>> BTW, do you typically have useful history on these branches? >>>>>>> Typically the reason to preserve history is for commit logs (which we >>>>>>> drop when we commit the branch as a squash) or for merges (which we're >>>>>>> breaking because we're rebasing). >>>>>>> It would be a lot faster if it could forward-port a branch as a single >>>>>>> commit instead of multiple. >>>>>> >>>>>> No, I usually don't have useful history in my local branches (most of >>>>>> the time I upload to codereview after every commit anyway). >>>>>> >>>>> >>>> >>> >> > --~--~---------~--~----~------------~-------~--~----~ Chromium Developers mailing list: [email protected] View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~----------~----~----~----~------~----~------~--~---
