[cfe-dev] Cilk Plus extensions in LLVM/Clang

[Hal Finkel]

----- Original Message -----
> From: "Ben Langmuir" <ben.langmuir at intel.com>
> To: "Hal Finkel" <hfinkel at anl.gov>
> Cc: "Clang Developer's Mailing List" <cfe-dev at cs.uiuc.edu>
> Sent: Friday, March 8, 2013 8:07:23 AM
> Subject: RE: [cfe-dev] Cilk Plus extensions in LLVM/Clang
> 
> > Also, (and perhaps this is really just a git question), is there an
> > easy way to generate a patch against the upstream sources from a
> > clone of the git repository?
> 
> You mean the differences between our "cilkplus" branch and LLVM/Clang
> trunk?  I just pushed a master branch to clang and llvm, so if you
> do:
> 
> $ git fetch
> $ git diff `git merge-base cilkplus origin/master`..cilkplus

How do I get your origin/master into my clone?

llvm$ git merge-base cilkplus origin/master
fatal: Not a valid object name origin/master

llvm$ git branch -a
* cilkplus
  remotes/origin/HEAD -> origin/cilkplus
  remotes/origin/cilkplus

Thanks again,
Hal

> 
> That will give you a diff against the last revision that is common to
> the master and cilkplus branches.  You could do "git diff
> origin/master..cilkplus", but that would include changes to master
> since our last merge, which would just confuse things.
> 
> Ben
>