openocd-devel

[Openocd-development] SWD, Simon's branch and git.

[Andrew R. <an...@ro...>]

I've recently seen some of the work Simon has done with SWD and I think
that it overlaps with what I am doing. I had, until now, missed Simon's
post on the 7th November 2009 and some earlier posts.

I can't seem to get Simon's branch cloned properly. Here's what I'm
doing:

$ git clone http://repo.or.cz/r/openocd.git
$ git branch swj 7acb2607ff79336174014ddfc313433ada9abc44
$ git checkout swj
$ git pull http://repo.or.cz/r/openocd/simonqian.git sq/swj_versaloon

The problem is that I don't get any of the logs relating to the SWD
branch, instead I get:

$ git log
commit 6b7e8d3b6e589e92c32d4d5f3bc8f1229d178416
Merge: 7acb260... 55d483f...
Author: Andrew Rogers <an...@ro...>
Date:   Sun Nov 15 21:14:07 2009 +0000

    Merge branch 'sq/swj_versaloon' of
http://repo.or.cz/r/openocd/simonqian into swj

commit 7acb2607ff79336174014ddfc313433ada9abc44
......

Notice the only log entry is that I merged a branch. Well I guess that
is what I did, 'git pull' merges. So I tried a clone:

$ git clone http://repo.or.cz/r/openocd/simonqian.git

gives me:
warning: remote HEAD refers to nonexistent ref, unable to checkout.

I would like to work with Simon's code and extend it from there rather
than do what he has already done. First I need to successfully clone
Simon's branch. Help please!

Regards
Andrew 

Re: [Openocd-development] SWD, Simon's branch and git.

[Andrew R. <an...@ro...>]

I had some success by doing:

$ git clone http://repo.or.cz/r/openocd/simonqian.git
$ cd simonqian/
$ git pull http://repo.or.cz/r/openocd/simonqian.git sq/swj_versaloon

Regards
Andrew


On Sun, 2009-11-15 at 21:31 +0000, Andrew Rogers wrote:
> I've recently seen some of the work Simon has done with SWD and I think
> that it overlaps with what I am doing. I had, until now, missed Simon's
> post on the 7th November 2009 and some earlier posts.
> 
> I can't seem to get Simon's branch cloned properly. Here's what I'm
> doing:
> 
> $ git clone http://repo.or.cz/r/openocd.git
> $ git branch swj 7acb2607ff79336174014ddfc313433ada9abc44
> $ git checkout swj
> $ git pull http://repo.or.cz/r/openocd/simonqian.git sq/swj_versaloon
> 
> The problem is that I don't get any of the logs relating to the SWD
> branch, instead I get:
> 
> $ git log
> commit 6b7e8d3b6e589e92c32d4d5f3bc8f1229d178416
> Merge: 7acb260... 55d483f...
> Author: Andrew Rogers <an...@ro...>
> Date:   Sun Nov 15 21:14:07 2009 +0000
> 
>     Merge branch 'sq/swj_versaloon' of
> http://repo.or.cz/r/openocd/simonqian into swj
> 
> commit 7acb2607ff79336174014ddfc313433ada9abc44
> ......
> 
> Notice the only log entry is that I merged a branch. Well I guess that
> is what I did, 'git pull' merges. So I tried a clone:
> 
> $ git clone http://repo.or.cz/r/openocd/simonqian.git
> 
> gives me:
> warning: remote HEAD refers to nonexistent ref, unable to checkout.
> 
> I would like to work with Simon's code and extend it from there rather
> than do what he has already done. First I need to successfully clone
> Simon's branch. Help please!
> 
> Regards
> Andrew 
> 
> 
> _______________________________________________
> Openocd-development mailing list
> Ope...@li...
> https://lists.berlios.de/mailman/listinfo/openocd-development

Re: [Openocd-development] SWD, Simon's branch and git.

[Andrew R. <an...@ro...>]

Now that I got the repository cloned as detailed in my previous email I
can do '$ git format-patch 70f735007d7b0f7ec9d269c4529d9f62c0eb779d' and
get a similar diff file.

Do you think that if I were to break this patch down into many really
small patches it would be put into the master openocd branch?

If so, when I 'git commit', my credentials will appear in the log. How
can I best prepare the small patches and ensure that Simon is given the
credit for his own work?

Regards
Andrew


On Mon, 2009-11-16 at 18:25 +0800, simon qian wrote:
> Hi,
> Sorry, I'm not fimilar with git, attachment is the patch file.
> I can provide -d3 log file if you want, which can provide a detailed
> view of every operation. And the detailed signal of the SWD operation.
> 
>  
> 2009/11/16 Andrew Rogers <an...@ro...>
>         I had some success by doing:
>         
>         $ git clone http://repo.or.cz/r/openocd/simonqian.git
>         $ cd simonqian/
>         $ git pull http://repo.or.cz/r/openocd/simonqian.git
>         sq/swj_versaloon
>         
>         
>         Regards
>         Andrew
>         
>         
>         
>         On Sun, 2009-11-15 at 21:31 +0000, Andrew Rogers wrote:
>         > I've recently seen some of the work Simon has done with SWD
>         and I think
>         > that it overlaps with what I am doing. I had, until now,
>         missed Simon's
>         > post on the 7th November 2009 and some earlier posts.
>         >
>         > I can't seem to get Simon's branch cloned properly. Here's
>         what I'm
>         > doing:
>         >
>         > $ git clone http://repo.or.cz/r/openocd.git
>         > $ git branch swj 7acb2607ff79336174014ddfc313433ada9abc44
>         > $ git checkout swj
>         > $ git pull http://repo.or.cz/r/openocd/simonqian.git
>         sq/swj_versaloon
>         >
>         > The problem is that I don't get any of the logs relating to
>         the SWD
>         > branch, instead I get:
>         >
>         > $ git log
>         > commit 6b7e8d3b6e589e92c32d4d5f3bc8f1229d178416
>         > Merge: 7acb260... 55d483f...
>         > Author: Andrew Rogers <an...@ro...>
>         > Date:   Sun Nov 15 21:14:07 2009 +0000
>         >
>         >     Merge branch 'sq/swj_versaloon' of
>         > http://repo.or.cz/r/openocd/simonqian into swj
>         >
>         > commit 7acb2607ff79336174014ddfc313433ada9abc44
>         > ......
>         >
>         > Notice the only log entry is that I merged a branch. Well I
>         guess that
>         > is what I did, 'git pull' merges. So I tried a clone:
>         >
>         > $ git clone http://repo.or.cz/r/openocd/simonqian.git
>         >
>         > gives me:
>         > warning: remote HEAD refers to nonexistent ref, unable to
>         checkout.
>         >
>         > I would like to work with Simon's code and extend it from
>         there rather
>         > than do what he has already done. First I need to
>         successfully clone
>         > Simon's branch. Help please!
>         >
>         > Regards
>         > Andrew
>         >
>         >
>         > _______________________________________________
>         > Openocd-development mailing list
>         > Ope...@li...
>         >
>         https://lists.berlios.de/mailman/listinfo/openocd-development
>         
>         
>         _______________________________________________
>         Openocd-development mailing list
>         Ope...@li...
>         https://lists.berlios.de/mailman/listinfo/openocd-development
>         
> 
> 
> 
> -- 
> Best Regards, SimonQian
> http://www.SimonQian.com

Re: [Openocd-development] SWD, Simon's branch and git.

[David B. <da...@pa...>]

On Monday 16 November 2009, Andrew Rogers wrote:
> 
> Do you think that if I were to break this patch down into many really
> small patches it would be put into the master openocd branch?

Well, "one humongous patch" won't get merged, so it's got to get
broken down into logical chunks in any case.  I'd kind of like
to see this at least *start* in the 0.5 series.

What I'm missing right now is seeing a model for how this will
work.  I've started to look at the patches from Simon and Andrew;
they're both too huge to understand at once (thus un-reviewable
and un-mergeable).

Note that the point isn't to have "really small" patches.  It's
to have comprehensible/reviewable patches, usually in a series
of chunks that build on each other.  Reviewers will look at each
one, usually in sequence, and need to have breaks.

And for something substantial like this, it's also customary to
plan on having multiple iterations ... and quite possibly to see
incremental merges.

I'll post some technical followup on another thread.

 
> If so, when I 'git commit', my credentials will appear in the log. How
> can I best prepare the small patches and ensure that Simon is given the
> credit for his own work?

Read the git documentation more closely ... what I generally do is
"git am" from a patch with "From:" and "Subject:" lines, and only
do "git commit" for stuff I've written myself.  There are environment
variables that "git commit" will use.

So far there's not been a lot of traffic for patches I'm comfortable
merging right from someone's repository.  (I expect that will be
happening someday though!)  So for now, I want to receive patches as
text ... at which point it's easy to edit the text to make sure the
changes get properly credited.

- Dave