[Bro-Dev] "git diff" questions

[Gregor Maier]

On 7/20/11 17:38 , Vern Paxson wrote:
> Thanks for the explanation.  Two comments/questions:
>
>> git submodule update --recursive
>
> This doesn't work:
>
> 	Usage: git submodule [--quiet] [--cached] [add [-b branch]<repo>  <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit<n>] [<commit>]] [--] [<path>...]|[foreach<command>]|[sync [--] [<path>...]]
>
> (I'm running git 1.6.3.2.)

Hmm. I'm running 1.7.5.4. I guess that added the recursive then....

You can probably use:
   git submodule update
   git submodule foreach git submodule update

(IIRC the broccoli repository has submodules of its own, so you need to 
either to it recursively or do it "by hand" using the submodule foreach)

>> Assuming that you were in "master" and did a check-out of "topic/foobar"
>
> All I did was check-out "master", I'm pretty sure.  (Is there a command
> that will tell me how I wound up with the tree I have?)
 >

Unfortunately not. Since in theory it should not matter how you wound up 
with the tree. The submodules just bust this nice theory :-(

What could also have happend is that you cloned (and checked out) master 
a while ago and then later updated it with a git pull/fetch. If the 
submodule pointers in master changed in the meantime you would also get 
this notice.


cu
gregor

-- 
Gregor Maier
<gregor at icir.org>  <gregor at icsi.berkeley.edu>
Int. Computer Science Institute (ICSI)
1947 Center St., Ste. 600
Berkeley, CA 94704, USA
http://www.icir.org/gregor/