[Webkit-unassigned] [Bug 36394] Include git commits in the diff for webkit-patch upload

[bugzilla-daemon at webkit.org]

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





--- Comment #5 from Evan Martin <evan at chromium.org>  2010-03-21 22:52:53 PST ---
+        # Diff against the remote server to include both working copy and
committed diffs.

It's not the remote server (all git operations but push/pull are local), it's
the remote branch.


+        return run_command(['git', 'diff', '--binary', remote])

so say you're in this situation

*--A--B--C--D   <- trunk
    \
     X--Y--Z  <- my awesome patch

you're diffing D and Z, so your patch will include all of the stuff in A, B, C,
which I don't think you want.

Two options:
1) refuse to do a diff unless your patch is merged with trunk.  (If you did a
"merge trunk" into your branch, you'd have a new commit derived from D and Z
and your diff command would display the right thing.)

2) or, do "git diff --binary trunk..."  (with the ... added), which basically
means "diff the stuff I did not on trunk" and is computed as a diff of Z and A
(the point where your branch diverged from trunk)

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