Re: [git-users] Empty directories with submodules

2013-03-12 Thread FlashBurn


On Monday, March 4, 2013 6:27:23 PM UTC-5, Rahmat Budiharso wrote:
>
> Have you try do a 'git submodule update --init' ?
> On Mar 5, 2013 12:48 AM, "FlashBurn" > 
> wrote:
>
>> I added a few submodules to my project (I already had some and needed a 
>> few others) at home and then I tried ran a pull request at work. The only 
>> thing that happened is that it re-created empty directories with submodules.
>> git pull
>> git submodule status
>>  bundle/FuzzyFinder
>>  bundle/L9
>>  bundle/vim-pathogen
>>  bundle/vim-powerline
>>  bundle/vim-project
>>
>> All of those directories were empty. I tried running
>> git submodule update
>>
>> But nothing happened. Those directories stayed empty.
>> Can anyone explain why those submodules were not cloned? I had to run
>> git sumodule init
>> git submodule update
>>
>> Only after that I got all my sumodules. Do I have to run git submodule 
>> init every time I add a new one? My understanding was is that I have to run 
>> git submodule update. Does anybody know what is the issue? Any help is 
>> appreciated.
>>
>> I'm running
>> Windows XP Pro Version 2002 SP 3
>> git 1.8.0.msysgit.0
>>
>>  -- 
>> You received this message because you are subscribed to the Google Groups 
>> "Git for human beings" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to git-users+...@googlegroups.com .
>> For more options, visit https://groups.google.com/groups/opt_out.
>>  
>>  
>>
> Thank you for the help. This option worked. 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] not clear about submodules

2013-03-12 Thread FlashBurn


On Monday, March 4, 2013 4:57:56 PM UTC-5, Gergely Polonkai wrote:
>
> I'm not tottally sure about it, but AFAIK
>
> git submodule update
>
> fetches the latest commit of the "master" branch, and then checks it out, 
> leaving the submodule directory in a detached state. You can, however, 
> check out a specific branch or tag (see the git-checkout manual on that). I 
> hope this answer suites you, otherwise you must wait for a more advanced 
> user's answer...
> On Mar 4, 2013 10:41 PM, "FlashBurn" > 
> wrote:
>
>> I'm not very clear on submodules. I did look at the Online git book, 
>> http://git-scm.com/book/ch6-6.html, but I'm still somewhat confused. 
>> From this chapter I understood that if I want one project to include 
>> another, I use submodules. But here is where I'm clear. Say I have the 
>> following directory structure
>> myproject (regular git project)
>>  |
>>  |-some other project 1 (as a git submodule)
>>  |-some other project 2 (as a git submodule)
>>
>> 1) Say both project1 and project2 are being developed. However when I 
>> clone or pull myproject I don't want the latest version of project 1 and 
>> project 2. I want them at the state when I created them as submodules. Do I 
>> need to git add myproject/project1 myproject/project2 ?
>> 2) What do I need to do I do want the latest revisions of project1 and 
>> project2 when myproject is clonded or pulled?
>>
>> Any help is appreciated.
>>
>> -- 
>> You received this message because you are subscribed to the Google Groups 
>> "Git for human beings" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to git-users+...@googlegroups.com .
>> For more options, visit https://groups.google.com/groups/opt_out.
>>  
>>
>
Can you explain what does it mean for a directory to be in a detached state?

>  
>>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] untracked content, submodules, and other things

2013-03-12 Thread FlashBurn
I'm using git to manage my vim plugins. I did read a git 
book, http://git-scm.com/book, but I'm having trouble understanding some of 
the concepts.

Right now I'm facing a problem with git submodules. Currently when I run 
git status it shows that all of my submodules are untracked.
Here is part of the output of git status

# modified: bundle/FuzzyFinder (untracked content)
# modified: bundle/L9 (untracked content)
# modified: bundle/cscope (untracked content)
# modified: bundle/taglist (untracked content)
# modified: bundle/vim-project (untracked content)

I read several posts online and also looked at git help status. Pretty much 
all the posts recommend using some form of --ignore-submodules option. Here 
is help for this option
--ignore-submodules[=]

Ignore changes to submodules when looking for changes.  can be either 
"none", "untracked", "dirty" or "all", which is the default. Using "none" 
will consider the submodule modified when it either contains untracked or 
modified files or its HEAD differs from the commit recorded in the 
superproject and can be used to override any settings of the *ignore* option 
in 
git-config(1)
 or 
gitmodules(5).
 
When "untracked" is used submodules are not considered dirty when they only 
contain untracked content (but they are still scanned for modified 
content). Using "dirty" ignores all changes to the work tree of submodules, 
only changes to the commits stored in the superproject are shown (this was 
the behavior before 1.7.0). Using "all" hides all changes to submodules 
(and suppresses the output of submodule summaries when the config option 
status.submodulesummary is set).


I'm having trouble undestanding this help message.
1) When it talks about the HEAD, does it mean the HEAD on the remote server 
or does it mean the HEAD of the submodule on my local machine?2) What does 
it mean for a submodule to be considered dirty?3) What is meant by 
untracked content?4) What is meant by the work tree and the work tree of 
submodules? Is there a difference between them?
Any help is appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] not clear about submodules

2013-03-04 Thread FlashBurn
I'm not very clear on submodules. I did look at the Online git 
book, http://git-scm.com/book/ch6-6.html, but I'm still somewhat confused. 
>From this chapter I understood that if I want one project to include 
another, I use submodules. But here is where I'm clear. Say I have the 
following directory structure
myproject (regular git project)
 |
 |-some other project 1 (as a git submodule)
 |-some other project 2 (as a git submodule)

1) Say both project1 and project2 are being developed. However when I clone 
or pull myproject I don't want the latest version of project 1 and project 
2. I want them at the state when I created them as submodules. Do I need to 
git add myproject/project1 myproject/project2 ?
2) What do I need to do I do want the latest revisions of project1 and 
project2 when myproject is clonded or pulled?

Any help is appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] not clear about submodules

2013-03-04 Thread FlashBurn
I'm not very clear on submodules. I did look at the Online git 
book, http://git-scm.com/book/ch6-6.html, but I'm still somewhat confused. 
>From this chapter I understood that if I want one project to include 
another, I use submodules. But here is where I'm clear. Say I have the 
following directory structure
myproject (regular git project)
 |
 |-some other project 1 (as a git submodule)
 |-some other project 2 (as a git submodule)

1) Say both project1 and project2 are being developed. However when I clone 
or pull myproject I don't want the latest version of project 1 and project 
2. I want them at the state when I created them as submodules. Do I need to 
git add myproject/project1 myproject/project2 ?
2) What do I need to do I do want the latest revisions of project1 and 
project2 when myproject is clonded or pulled?

Any help is appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




Re: [git-users] warning: Not setting branch master as its own upstream.

2013-03-04 Thread FlashBurn


On Monday, March 4, 2013 2:09:00 PM UTC-5, Gergely Polonkai wrote:
>
> Both --track and --set-upstream-to operates on the current branch. The 
> thing you need is:
>
> --track origin/master
>
> or
>
> --set-upstream-to=origin/master
>
> Gergely
>
>
> On 4 March 2013 18:21, FlashBurn >wrote:
>
>> I committed some changes to my repository at home and then I tried to 
>> pull them at my work and I got the following message
>>
>> There is no tracking information for the current branch.
>> Please specify which branch you want to merge with.
>> See git-pull(1) for details.
>>   git pull  
>> If you wish to set tracking information for this branch you can do so 
>> with:
>>   git branch --set-upstream master origin/master
>>
>> Naturally I tried to run git branch --set-upstream master origin/master 
>> And here is what I got when I ran it
>> The --set-upstream flag is deprecated and will be removed. Consider using 
>> --track or --set-upstream-to
>> Branch master set up to track remote branch master from origin.
>>
>> Since this option will be removed I decided to it "the modern" way using 
>> --track. Here is what I got
>> after running git branch --track master
>> fatal: A branch named 'master' already exists.
>>
>> After this error I decided to use --set-upstream-to option. Here is what 
>> I got after running git branch --set-upstream-to=master
>> warning: Not setting branch master as its own upstream.
>>  
>> Then I ran git pull and everything worked. I suspect it worked because of 
>> --set-upstream deprecated. Can someone explain what have I done
>> wrong with --track and --set-upstream-to options? Any help is appreciated.
>>
>>  -- 
>> You received this message because you are subscribed to the Google Groups 
>> "Git for human beings" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to git-users+...@googlegroups.com .
>> For more options, visit https://groups.google.com/groups/opt_out.
>>  
>>  
>>
> Thanks it worked. 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] Empty directories with submodules

2013-03-04 Thread FlashBurn
I added a few submodules to my project (I already had some and needed a few 
others) at home and then I tried ran a pull request at work. The only thing 
that happened is that it re-created empty directories with submodules.
git pull
git submodule status
 bundle/FuzzyFinder
 bundle/L9
 bundle/vim-pathogen
 bundle/vim-powerline
 bundle/vim-project

All of those directories were empty. I tried running
git submodule update

But nothing happened. Those directories stayed empty.
Can anyone explain why those submodules were not cloned? I had to run
git sumodule init
git submodule update

Only after that I got all my sumodules. Do I have to run git submodule init 
every time I add a new one? My understanding was is that I have to run git 
submodule update. Does anybody know what is the issue? Any help is 
appreciated.

I'm running
Windows XP Pro Version 2002 SP 3
git 1.8.0.msysgit.0

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.




[git-users] warning: Not setting branch master as its own upstream.

2013-03-04 Thread FlashBurn
I committed some changes to my repository at home and then I tried to pull 
them at my work and I got the following message

There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
  git pull  
If you wish to set tracking information for this branch you can do so with:
  git branch --set-upstream master origin/master

Naturally I tried to run git branch --set-upstream master origin/master 
And here is what I got when I ran it
The --set-upstream flag is deprecated and will be removed. Consider using 
--track or --set-upstream-to
Branch master set up to track remote branch master from origin.

Since this option will be removed I decided to it "the modern" way using 
--track. Here is what I got
after running git branch --track master
fatal: A branch named 'master' already exists.

After this error I decided to use --set-upstream-to option. Here is what I 
got after running git branch --set-upstream-to=master
warning: Not setting branch master as its own upstream.

Then I ran git pull and everything worked. I suspect it worked because of 
--set-upstream deprecated. Can someone explain what have I done
wrong with --track and --set-upstream-to options? Any help is appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.