Bug 39603 - _svn_branch_has_extra_commits needs to check for ^HEAD instead of ^head.
Summary: _svn_branch_has_extra_commits needs to check for ^HEAD instead of ^head.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Linux
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-24 10:07 PDT by Marcus Bulach
Modified: 2010-05-24 20:52 PDT (History)
5 users (show)

See Also:


Attachments
Patch (1.35 KB, patch)
2010-05-24 10:10 PDT, Marcus Bulach
ojan: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Marcus Bulach 2010-05-24 10:07:01 PDT
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.
Comment 1 Marcus Bulach 2010-05-24 10:10:52 PDT
Created attachment 56901 [details]
Patch
Comment 2 Ojan Vafai 2010-05-24 10:41:53 PDT
Can you explain this a bit more? In all my testing, head and HEAD were equivalent. Are they different in some way?
Comment 3 Marcus Bulach 2010-05-24 10:46:36 PDT
(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.
Comment 4 Ojan Vafai 2010-05-24 10:59:43 PDT
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.
Comment 5 Tony Chang 2010-05-24 20:52:43 PDT
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.