Bug 39603 – _svn_branch_has_extra_commits needs to check for ^HEAD instead of ^head.

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Marcus Bulach]

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

scm.py / _svn_branch_has_extra_commits needs to pass ^HEAD instead of ^head as param to git rev-list.

[Marcus Bulach]

Created attachment 56901 [details]
Patch

[Ojan Vafai]

Can you explain this a bit more? In all my testing, head and HEAD were equivalent. Are they different in some way?

[Marcus Bulach]

(In reply to comment #2)
> Can you explain this a bit more? In all my testing, head and HEAD were equivalent. Are they different in some way?


Hi Ojan,

I'm not sure if it's a config issue on our side (it happened to me, hans and satish), on linux: with ^head, it says "invalid revision"

git rev-list --max-count=1 trunk ^head
fatal: bad revision '^head'

but with HEAD it works fine.. I'm not a git expert, so I'm not too sure what exactly are the implications, and / or what config should I change.

[Ojan Vafai]

Comment on attachment 56901 [details]
Patch

Hm. Just tested on a linux machine. Apparently some (all?) linux versions of git don't accept 'head'. Thanks for the fix.

[Tony Chang]

Comment on attachment 56901 [details]
Patch

http://trac.webkit.org/changeset/60118

I committed this manually because it was preventing me from using webkit-patch.