[git-users] Re: How do I update a parent repository's history to reflect changes made to a submodule's history done using 'git branch-filter'?

[Thomas Ferris Nicolaisen]

On Monday, September 3, 2012 7:18:14 AM UTC+2, Walt Destler wrote:
>
> I have two Git repositories which I'll call *A* and *B*. Repo *B* happens 
> to be a submodule of Repo *A*.
>
> Repo *B* is chock full of binary files that I'd like to wipe from 
> history. (These are private repos so I won't be screwing anyone else up by 
> changing history.) I can easily run a branch-filter command to erase those 
> files from repo *B*'s history. That's not my problem.
>
> My problem is that, after running branch-filter on repo *B*, thousands of 
> commits in repo *A* will now point to (now-invalid) commits in repo *B*.
>
> So my question is: How do I modify the history of repo *A* so that each 
> commit of repo *A* points to the correct commit of repo *B*, after having 
> run branch-filter on repo *B*?
>

Hm, that sounds tricky. Conceptually you would need to hook into 
filter-branch, and after each commit-rewrite in repo *B*, dive into *A*, 
find all commits that reference (via .gitmodules) the re-written *B *commit, 
and rewrite them.

Filter-branch offers you to execute a command after each rewritten commit, 
and in this command you can use $GIT_COMMIT to reference the commit in *B 
*which 
is currently being rewritten. However, you also need the rewritten commit 
SHA. and I'm not sure how you can get hold of that.

I see that filter branch has 
this
:

A map function is available that takes an "original sha1 id" argument and 
> outputs a "rewritten sha1 id" if the commit has been already rewritten, and 
> "original sha1 id" otherwise


Maybe you could use this somehow to get hold of the rewritten commits. I 
can't really say as I'm not sure how to use this function.

In the end though, does it really matter if older revisions of A reference 
non-existing commits in the .gitmodules? As long as the current values are 
correct, your submodules will still work. 

And of course, you can also go through the old changes to .gitmodules with 
git rebase --interactive and change the SHAs manually.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/GDq995yqe7MJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] .gitignore and branches issues

[mem]

 

While checkout to master branch, I got:

Error: The following untracked working tree files would be overwritten by 
checkout:
nbproject/private/config.properties
nbproject/private/private.properties
nbproject/private/private.xml
nbproject/project.properties
nbproject/project.xml 

Please move or remove them before you can switch branches.  

Aborting

 So I have remove them (I've backup those files somewhere else outside the 
repo), and I was able to switch again.

The reason I've getting this it's because:

dev is ignoring those files. master isn't, because no .gitignore file is 
present there. Perhaps, when I was setting branches, I forgot it somehow...

They should both ignore those files.

Plus, when I push this to remote repos, those changes should be propagated 
for those remote repos as well. (I'm using a bare repo).


My question is:

*How can we add that .gitignore file to the master, so that this doesn't 
happen again ?*


**


**

Thanks in advance,*
*

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/eTgH8yge1ewJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] .gitignore and branches issues

[Konstantin Khomoutov]

On Mon, 3 Sep 2012 02:29:12 -0700 (PDT)
mem  wrote:

> While checkout to master branch, I got:
> 
> Error: The following untracked working tree files would be
> overwritten by checkout:
> nbproject/private/config.properties
> nbproject/private/private.properties
> nbproject/private/private.xml
> nbproject/project.properties
> nbproject/project.xml 
[...]
> dev is ignoring those files. master isn't, because no .gitignore file
> is present there. Perhaps, when I was setting branches, I forgot it
> somehow...
> 
> They should both ignore those files.
> 
> Plus, when I push this to remote repos, those changes should be
> propagated for those remote repos as well. (I'm using a bare repo).

Since .gitignore is a part of the repository snapshot forming a commit,
it will be "propagated" when people check out that state.

> My question is:
> 
> *How can we add that .gitignore file to the master, so that this
> doesn't happen again ?*

I'm a bit confused because the straightforward answer seems to be a
bit too easy to be serious: "just check out the `master' branch,
add .gitignore file and commit" or, alternatively, cherry-pick the
necessary commit(s) which dealt with .gitignore from your "dev" branch.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Why git merge always ask for a commit message?

[Mauro Sanna]

I have two branches: devel and master.
I'm using git as repository for some applications.
Usually I do changes under devel branch, commit and push.
Then I do a git checkout master, git merge devel and push and all done.
I always have done this but now, in a new application, when I do git merge 
devel into master it asks me for a commit message.
I read that it is not Fast-forward but it is done by recursive strategy.
Configuration are the same in all my projects so I don't know why now git 
merge asks for a commit message and git merge isn't done Fast-forward.
Can you help me please?
Thank you.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/Og9a71rfta4J.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] .gitignore and branches issues

[mem]

On Sep 3, 2012, at 11:34 , Konstantin Khomoutov wrote:

> On Mon, 3 Sep 2012 02:29:12 -0700 (PDT)
> mem  wrote:
> 
>> While checkout to master branch, I got:
>> 
>> Error: The following untracked working tree files would be
>> overwritten by checkout:
>> nbproject/private/config.properties
>> nbproject/private/private.properties
>> nbproject/private/private.xml
>> nbproject/project.properties
>> nbproject/project.xml 
> [...]
>> dev is ignoring those files. master isn't, because no .gitignore file
>> is present there. Perhaps, when I was setting branches, I forgot it
>> somehow...
>> 
>> They should both ignore those files.
>> 
>> Plus, when I push this to remote repos, those changes should be
>> propagated for those remote repos as well. (I'm using a bare repo).
> 
> Since .gitignore is a part of the repository snapshot forming a commit,
> it will be "propagated" when people check out that state.

Ok.

> 
>> My question is:
>> 
>> *How can we add that .gitignore file to the master, so that this
>> doesn't happen again ?*
> 
> I'm a bit confused because the straightforward answer seems to be a
> bit too easy to be serious: "just check out the `master' branch,
> add .gitignore file and commit" or, alternatively, cherry-pick the
> necessary commit(s) which dealt with .gitignore from your "dev" branch.

Issue is solved. But thanks for your reply. 

I was enable to checkout the master branch, unless I force it:

git checkout --force master

Anyway, for the record: here's the steps I've done with help from others:

1) I have cloned the project to somewhere else.
2) I've checkout master on that clone.
3) Placed the gitignore into the master as it should have been there from the 
beginning: 
 git show dev:.gitignore > .gitignore
3) I've removed the files from the tree by doing git rm "all files that where 
on gitignore one by one"
4) I've added the .gitignore file to the repo.
5) commit it
6) switch back to the original repo and did:
7) git fetch /path/to/fix-project master:master
8) git checkout master, and I got:
Switched to branch 'master' 
Your branch is ahead of 'hub/master' by 1 commit.
this is my remote master branch.
9) Pushed to remote master.
10) checkout dev again


Thanks again for your reply.



-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: Efficient project architecture with git

[Thomas Ferris Nicolaisen]

On Friday, August 31, 2012 10:46:12 AM UTC+2, takku divakar wrote:
>
>
> Hi Thomas Ferris Nicolaisen Recently i am attended an interview , the 
> interview panel asked me let you explain the current  project architecture.
> i am given some explanation but those are not satisfied. Please tell me 
> the brief explanation about project architecture in oracle project.
>

This sounds awfully context-specific. I'm not sure how "Oracle projects" 
are made up architecture-wise, other than that cramming in a lot of 
expensive "enterprise" monolithic components seems to be a common pattern. 
Needless to say, Git doesn't fit very well into these kind of projects, 
since it's free and simple ;)

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/dEJR2ex2Q6EJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Trying to add a submodule which still exists on the index (unable to remove the submodule from there)

[Łukasz Siwiński]

I haven't tried submodules yet, but did You commited your submodule?
Command:

git add 

adds your files (submodules?) only to stage index. If You want to commit
files added to stage index, You should commit them with:

git commit -m "your commit message"

Pozdrawiam,

-- 
Łukasz Siwiński
http://siwinski.info

Wysłano z telefonu.
31-08-2012 17:07, "Rui Gonçalves"  napisał(a):

> Hi there!
>
> I'm trying to add a submodule that already existed (different git remote
> repository). As I didn't searched before how to do it correctly, I think
> I've messed up my repository and I need some help to fix it again.
> I've already deleted all the relevant sections from the .gitmodules and
> .git/config regarding the submodules I want to delete. I've also verified
> that there is not modules directory inside my .git/ directory.
>
> However, when I run the command *git rm --cached path_to_submodule*(without 
> trailing space), the following message is displayed:
> *fatal: pathspec 'path_to_submodule' did not match any files*
>
> As the previous command fails, when I try to add again the same submodule
> with the new definitions, running the command *git submodule add
> gituser@host:repo.git*, this is the displayed message:
> *'repo' already exists in the index*
>
> How can I solve this problem?
> Thanks in advance for the help,
> Regards!
>
>
>  --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To view this discussion on the web visit
> https://groups.google.com/d/msg/git-users/-/cFdmzv0HeZAJ.
> To post to this group, send email to git-users@googlegroups.com.
> To unsubscribe from this group, send email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/git-users?hl=en.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: Why git merge always ask for a commit message?

[Antony Male]

On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:

> Then I do a git checkout master, git merge devel and push and all done.
> I always have done this but now, in a new application, when I do git merge 
> devel into master it asks me for a commit message.
>

In version 1.7.10, git started prompting for a commit message after every 
merge. The rationale behind this is explained in Junio's (the maintainer's) 
blog post [1]

Antony

[1]: http://git-blame.blogspot.co.uk/2012/02/anticipating-git-1710.html

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/y0ji-qYo-vcJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Why git merge always ask for a commit message?

[Mauro]

On 3 September 2012 18:13, Antony Male  wrote:
> On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:
>>
>> Then I do a git checkout master, git merge devel and push and all done.
>> I always have done this but now, in a new application, when I do git merge
>> devel into master it asks me for a commit message.
>
>
> In version 1.7.10, git started prompting for a commit message after every
> merge. The rationale behind this is explained in Junio's (the maintainer's)
> blog post [1]

Ok but, why it don't ask for a commit message when used in some other projects?
.git/config is the same.
Perhaps because I've set the repository using git before 1.7.10?
>
> Antony
>
> [1]: http://git-blame.blogspot.co.uk/2012/02/anticipating-git-1710.html
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To view this discussion on the web visit
> https://groups.google.com/d/msg/git-users/-/y0ji-qYo-vcJ.
>
> To post to this group, send email to git-users@googlegroups.com.
> To unsubscribe from this group, send email to
> git-users+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/git-users?hl=en.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Why git merge always ask for a commit message?

[Antony Male]

On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
>
> On 3 September 2012 18:13, Antony Male > 
> wrote: 
> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: 
> >> 
> >> Then I do a git checkout master, git merge devel and push and all done. 
> >> I always have done this but now, in a new application, when I do git 
> merge 
> >> devel into master it asks me for a commit message. 
> > 
> > 
> > In version 1.7.10, git started prompting for a commit message after 
> every 
> > merge. The rationale behind this is explained in Junio's (the 
> maintainer's) 
> > blog post [1] 
>
> Ok but, why it don't ask for a commit message when used in some other 
> projects? 
> .git/config is the same. 
> Perhaps because I've set the repository using git before 1.7.10? 
>

Maybe in one project the merges you're doing are non-fast-forward (as you 
stated), whereas in the others they're fast-forward? Maybe there's a 
configuration difference? (I didn't think there was a config key to disable 
this behaviour, but it's worth a check). 
 

> > 
> > Antony 
> > 
> > [1]: http://git-blame.blogspot.co.uk/2012/02/anticipating-git-1710.html 
> > 
> > -- 
> > You received this message because you are subscribed to the Google 
> Groups 
> > "Git for human beings" group. 
> > To view this discussion on the web visit 
> > https://groups.google.com/d/msg/git-users/-/y0ji-qYo-vcJ. 
> > 
> > To post to this group, send email to git-...@googlegroups.com. 
>
> > To unsubscribe from this group, send email to 
> > git-users+...@googlegroups.com . 
> > For more options, visit this group at 
> > http://groups.google.com/group/git-users?hl=en. 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/aFT01gTlGFIJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Unified diff with word or character coloring

[David Erickson]

Hi is there any way to achieve word or character-level diff coloring when 
using the unified diff (line by line) output format?  In particular I would 
like to have an output format that continues to work within git-gui, but be 
able to quickly visually identify which words/characters have changed in 
the diff.  The use case is for latex documents, which can occasionally have 
long non-word wrapped lines, but even if they aren't long this can help a 
lot.

Also as a feature request I would love to be able to select word/character 
level changes to stage/unstage for commit in git-gui.

Thanks!
David

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/pfbnwjvk44UJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Why git merge always ask for a commit message?

[Mauro]

On 3 September 2012 18:56, Antony Male  wrote:
> On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
>>
>> On 3 September 2012 18:13, Antony Male  wrote:
>> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:
>> >>
>> >> Then I do a git checkout master, git merge devel and push and all done.
>> >> I always have done this but now, in a new application, when I do git
>> >> merge
>> >> devel into master it asks me for a commit message.
>> >
>> >
>> > In version 1.7.10, git started prompting for a commit message after
>> > every
>> > merge. The rationale behind this is explained in Junio's (the
>> > maintainer's)
>> > blog post [1]
>>
>> Ok but, why it don't ask for a commit message when used in some other
>> projects?
>> .git/config is the same.
>> Perhaps because I've set the repository using git before 1.7.10?
>
>
> Maybe in one project the merges you're doing are non-fast-forward (as you
> stated), whereas in the others they're fast-forward? Maybe there's a
> configuration difference? (I didn't think there was a config key to disable
> this behaviour, but it's worth a check).


Here the config for two of my projects.
The first is not fast-forward while in the second the merge is fast-forward.
As you can see there are no differences.
So I don't understand why the merge of the first project is not
fast-forward and asks for a commit message.

[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = ssh://192.168.241.11/var/git-repos/bbb_rails.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "devel"]
remote = origin
merge = refs/heads/devel



[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = ssh://192.168.241.11:/var/git-repos/operatorieconomici.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "devel"]
remote = origin
merge = refs/heads/devel

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Why git merge always ask for a commit message?

[Antony Male]

On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote:
>
> On 3 September 2012 18:56, Antony Male > 
> wrote: 
> > On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: 
> >> 
> >> On 3 September 2012 18:13, Antony Male  wrote: 
> >> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: 
> >> >> 
> >> >> Then I do a git checkout master, git merge devel and push and all 
> done. 
> >> >> I always have done this but now, in a new application, when I do git 
> >> >> merge 
> >> >> devel into master it asks me for a commit message. 
> >> > 
> >> > 
> >> > In version 1.7.10, git started prompting for a commit message after 
> >> > every 
> >> > merge. The rationale behind this is explained in Junio's (the 
> >> > maintainer's) 
> >> > blog post [1] 
> >> 
> >> Ok but, why it don't ask for a commit message when used in some other 
> >> projects? 
> >> .git/config is the same. 
> >> Perhaps because I've set the repository using git before 1.7.10? 
> > 
> > 
> > Maybe in one project the merges you're doing are non-fast-forward (as 
> you 
> > stated), whereas in the others they're fast-forward? Maybe there's a 
> > configuration difference? (I didn't think there was a config key to 
> disable 
> > this behaviour, but it's worth a check). 
>
>
> Here the config for two of my projects. 
> The first is not fast-forward while in the second the merge is 
> fast-forward. 
>
 
There we go! Read up on the differences between fast-forward and 
non-fast-forward merges. [1] is a helpful resource.

Now, as you can see, fast-forward merges don't involve an actual merge 
commit. No merge commit = no commit message. Which is why you're not being 
prompted for a message for the fast-forward merge.

[1]: http://sandofsky.com/images/fast_forward.pdf

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/dEQoZB9xQGsJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Automatic repacking when cloning

[Haasip Satang]

Hi all, 

I'm having a question regarding the packs and the repacking of those during 
cloning. 

I'm migrating a big repository which after initial commit of all files 
contains only one pack file of 120MB in size (about 800 extracted). 

On this big repo I created various subtree branches so I can clone some of 
the folders individually (without getting the whole big thing). The problem 
is, however, that all my subtree clones seem to get a copy of the big 120MB 
pack, only to then extract 2MB from it. 

After testing a little bit I figured that this only happens if I use ssh or 
the git protocol to clone the repo. When using file:// to specify the 
remote repository some repacking seems to happen automatically and I end up 
with a new pack file for my clone that only contains the stuff that is 
really needed for my branch (which obviously results in much smaller size).

- Any idea how this could be achieved using ssh or git protocol (as 
obviously I'd prefer to use those over file:// )?

- Is that "as designed" or could it be a bug in git? 

Thanks 
Haasip







-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/xTOgx6FH3V8J.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: Automatic repacking when cloning

[Haasip Satang]

One more note...If I execute the following it repacks everything on client 
side and drops the big pack and I end up with the small pack I want to 
have: 

git pack-refs --prune
git reflog expire --all
git repack -a -d -f -l

So this results in exactly what cloning via file:// would give me right 
away. Just that I need to transfer the big pack first and then execute 
those commands. So again the questions:

- Is there anything that can be done to avoid this and do that already on 
server side? 
- Is it a bug in the git protocol? 

And maybe: 
- Can I provide multiple packs on server side to make the cloning even 
faster (so git doesn't have to create those packs dynamically when cloning)

Thanks again!

Am Montag, 3. September 2012 19:51:30 UTC+2 schrieb Haasip Satang:
>
> Hi all, 
>
> I'm having a question regarding the packs and the repacking of those 
> during cloning. 
>
> I'm migrating a big repository which after initial commit of all files 
> contains only one pack file of 120MB in size (about 800 extracted). 
>
> On this big repo I created various subtree branches so I can clone some of 
> the folders individually (without getting the whole big thing). The problem 
> is, however, that all my subtree clones seem to get a copy of the big 120MB 
> pack, only to then extract 2MB from it. 
>
> After testing a little bit I figured that this only happens if I use ssh 
> or the git protocol to clone the repo. When using file:// to specify the 
> remote repository some repacking seems to happen automatically and I end up 
> with a new pack file for my clone that only contains the stuff that is 
> really needed for my branch (which obviously results in much smaller size).
>
> - Any idea how this could be achieved using ssh or git protocol (as 
> obviously I'd prefer to use those over file:// )?
>
> - Is that "as designed" or could it be a bug in git? 
>
> Thanks 
> Haasip
>
>
>
>
>
>
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/M-J4b1BQteIJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Automatic repacking when cloning

[Konstantin Khomoutov]

On Mon, 3 Sep 2012 10:51:30 -0700 (PDT)
Haasip Satang  wrote:

> I'm having a question regarding the packs and the repacking of those
> during cloning. 
[...]
> On this big repo I created various subtree branches so I can clone
> some of the folders individually (without getting the whole big
> thing). The problem is, however, that all my subtree clones seem to
> get a copy of the big 120MB pack, only to then extract 2MB from it. 
[...]
> - Any idea how this could be achieved using ssh or git protocol (as 
> obviously I'd prefer to use those over file:// )?
> 
> - Is that "as designed" or could it be a bug in git? 

Try to asking this question on the main (devel) Git list instead,
(which is git at vger.kernel.org) as this list is for helping newbie
Git users rather than for solving hardcore technical issues.

See http://vger.kernel.org/vger-lists.html#git for more info.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Automatic repacking when cloning

[Philip Oakley]

From: "Konstantin Khomoutov" 
Sent: Monday, September 03, 2012 7:29 PM

On Mon, 3 Sep 2012 10:51:30 -0700 (PDT)
Haasip Satang  wrote:


I'm having a question regarding the packs and the repacking of those
during cloning.

[...]

On this big repo I created various subtree branches so I can clone
some of the folders individually (without getting the whole big
thing). The problem is, however, that all my subtree clones seem to
get a copy of the big 120MB pack, only to then extract 2MB from it.

[...]

- Any idea how this could be achieved using ssh or git protocol (as
obviously I'd prefer to use those over file:// )?

- Is that "as designed" or could it be a bug in git?
Have a look at the pack protocol details for more info about those 
hidden details

http://git-scm.com/book/en/Git-Internals-Transfer-Protocols
https://github.com/msysgit/git/tree/devel/Documentation/technical
https://github.com/msysgit/git/blob/devel/Documentation/technical/pack-protocol.txt

AFAICT what is packed depends on what is implicitly asked for, which by 
default is everything ;-)




Try to asking this question on the main (devel) Git list instead,
(which is git at vger.kernel.org) as this list is for helping newbie
Git users rather than for solving hardcore technical issues.

See http://vger.kernel.org/vger-lists.html#git for more info.

--
You received this message because you are subscribed to the Google 
Groups "Git for human beings" group.

To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.




-
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2012.0.2197 / Virus Database: 2437/5244 - Release Date: 
09/02/12




--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Why git merge always ask for a commit message?

[Mauro]

On 3 September 2012 19:45, Antony Male  wrote:
> On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote:
>>
>> On 3 September 2012 18:56, Antony Male  wrote:
>> > On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
>> >>
>> >> On 3 September 2012 18:13, Antony Male  wrote:
>> >> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:
>> >> >>
>> >> >> Then I do a git checkout master, git merge devel and push and all
>> >> >> done.
>> >> >> I always have done this but now, in a new application, when I do git
>> >> >> merge
>> >> >> devel into master it asks me for a commit message.
>> >> >
>> >> >
>> >> > In version 1.7.10, git started prompting for a commit message after
>> >> > every
>> >> > merge. The rationale behind this is explained in Junio's (the
>> >> > maintainer's)
>> >> > blog post [1]
>> >>
>> >> Ok but, why it don't ask for a commit message when used in some other
>> >> projects?
>> >> .git/config is the same.
>> >> Perhaps because I've set the repository using git before 1.7.10?
>> >
>> >
>> > Maybe in one project the merges you're doing are non-fast-forward (as
>> > you
>> > stated), whereas in the others they're fast-forward? Maybe there's a
>> > configuration difference? (I didn't think there was a config key to
>> > disable
>> > this behaviour, but it's worth a check).
>>
>>
>> Here the config for two of my projects.
>> The first is not fast-forward while in the second the merge is
>> fast-forward.
>
>
> There we go! Read up on the differences between fast-forward and
> non-fast-forward merges. [1] is a helpful resource.
>
> Now, as you can see, fast-forward merges don't involve an actual merge
> commit. No merge commit = no commit message. Which is why you're not being
> prompted for a message for the fast-forward merge.n

Yes I know, but I want my merges to be fast-forward.
Because git configuration is the same for the two projects I don't
know why the merge for first project go fast-forward while the second
one not.
What's the differerence between the two configurations? There is no
difference, so why I have a merge with fast-forward and a merge with
no fast-forward?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.