[Webkit-unassigned] [Bug 38852] webkit-patch land --squash commits too much if branch is not up to date

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=38852





--- Comment #2 from Evan Martin <evan at chromium.org>  2010-05-10 12:41:42 PST ---
# first shared commit between two branches
git merge-base trunk mybranch

# list any revs that are on trunk that aren't on mybranch 
git rev-list trunk ^mybranch


I think Ojan's suggestion is less likely to break: if you attempt to automatically merge with trunk before squashing you'll have to deal with the potential for merge conflicts.  I think your best bet is something like:

if `git rev-list --limit 1 trunk ^mybranch`; then
  echo "trunk has commits not in this branch; please merge or rebase it and try again"
  exit 1
fi

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.