[git-users] Re: Created yet another git tutorial
Apparently I underestimated the reception of my article on Git workflow. It's going to be featured in Dr. Dobb's Journal next month :D Awesome. Congratulations :) -- 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] Re: git submodule add failed
On Tuesday, July 9, 2013 4:55:29 PM UTC+2, Maxim Yefremov wrote: I want to add git submodule *$ git submodule add git+ssh://g...@bitbucket.org:userName/lib2.git node_modules/lib2* Cloning into 'node_modules/lib2'... ssh: Could not resolve hostname bitbucket.org:userName: nodename nor servname provided, or not known fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. Clone of 'git+ssh://g...@bitbucket.org:userName/lib2.git' into submodule path 'node_modules/lib2' failed Allthough I can do ... git clone g...@bitbucket.org:userName/lib2.git ... without problems. So I have valid ssh keys. My os is OsX. Why do you clone a different url than the one you used for the submodule (git+ssh)? -- 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] Re: lots of files
On Wednesday, July 10, 2013 12:35:28 AM UTC+2, HWSWMAN wrote: i want to setup git for my entire team, tons of files, many directories, etc ... i do NOT want everyone to clone all these files to their machine, but if they make changes, i want to track them ... for example on a shared drive there are many projects, each project has many folders with different files, etc ... should i make repos for every subdirectory under the main one? what is the best way to do this? There is no easy way to say without being knee-deep within your context/project. You have to provide more information for us to reason about how you should organize the repos. If you want to have lazy subdirectories (meaning they aren't checked out before the team member explicitly asks for it), I believe this is possible with git submodules, but I can't say exactly how at the moment.. -- 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] Truncate complete history
Hello everyone, I have a repo with a size of ca 4 gb and the history is longer than 10 years. Now I want to truncate this history to the last 3 years. I tried some things but nothing works really. What would be the best approach to truncate the history? Do I need to remove all tags and branches beyond the 3 years mark? It would be nice if someone could get me a hint on how to do this magic. Greetings, Iron Man -- 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] Re: Truncate complete history
On Wednesday, July 10, 2013 10:11:10 AM UTC+2, ironm...@gmail.com wrote: Hello everyone, I have a repo with a size of ca 4 gb and the history is longer than 10 years. Now I want to truncate this history to the last 3 years. I tried some things but nothing works really. What would be the best approach to truncate the history? Do I need to remove all tags and branches beyond the 3 years mark? It would be nice if someone could get me a hint on how to do this magic. Before you start deleting history to save space, you may want to first have a look at wiping big old files from history, especially the ones that aren't in use any more (i.e. they don't exist in HEAD). For this purpose, try out the BFG Repo Cleaner: http://rtyley.github.io/bfg-repo-cleaner/ Now, if you still want to remove history, you can use grafting. Conventionally, grafting is used to connect two commits together to form a new path in the history, but you can also leave one graft-point out, and the remaining one becomes the first ancestor in the repo. First select the SHA you want to be the first commit in your new history (git log --before 3 years or something like that). Now do: git clone --mirror myproject/ /tmp/experiment.git cd /tmp/experiment.git echo SHA info/grafts # have a look around and see if history is ok, then set the graft in stone by running filter branch through the history: git filter-branch --tag-name-filter cat -- --all git gc --prune=now Note that I did a full backup (mirror) of the repository before rewriting. Make sure you also do this, and keep the old repo in a safe place. Afterwards, do a clone of /tmp/experiment.git and see if it looks like what you want. Rinse and repeat if necessary. -- 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] Re: git bisect fixed/unfixed option
On Tuesday, July 9, 2013 7:11:08 PM UTC+2, Chemsi Mehdi wrote: Dear Git expert, I wonder how adding to git bisect fixed/unfixed options. This in order to find a good patch fixing a bug and not to find the bad commit. This is helpful for me. I am working with git version 1.7.11.7 Can you please advise on how adding these commands to git bisect. Hi, please ask about this on the Git developer mailing list: https://gist.github.com/tfnico/4441562 -- 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] Re: Truncate complete history
Thanks for your answer. I already tried the BFG Repo Cleaner, but while running it craches with this Exception : org.eclipse.jgit.errors.LargeObjectException$ExceedsLimit:. It looks like one commit is bigger than the 5 mb cache limit. I do have a look at the grafts / filter-branch functionality. -- 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] Re: git submodule add failed
Thanx, Thomas. This is kinda typo. And this works: *$ git submodule add g...@bitbucket.org:userName/lib2.git node_modules/lib2* On Wed, Jul 10, 2013 at 11:49 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Tuesday, July 9, 2013 4:55:29 PM UTC+2, Maxim Yefremov wrote: I want to add git submodule *$ git submodule add git+ssh://g...@bitbucket.org:userName/lib2.git node_modules/lib2* Cloning into 'node_modules/lib2'... ssh: Could not resolve hostname bitbucket.org:userName: nodename nor servname provided, or not known fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. Clone of 'git+ssh://g...@bitbucket.org:u**serName/lib2.git' into submodule path 'node_modules/lib2' failed Allthough I can do ... git clone g...@bitbucket.org:userNa**me/lib2.git ... without problems. So I have valid ssh keys. My os is OsX. Why do you clone a different url than the one you used for the submodule (git+ssh)? -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/HMgL5hv8exc/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- С уважением, Максим Ефремов -- 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] Re: Truncate complete history
On Wed, 10 Jul 2013 02:43:04 -0700 (PDT) ironm4nc...@gmail.com wrote: I already tried the BFG Repo Cleaner, but while running it craches with this Exception : org.eclipse.jgit.errors.LargeObjectException$ExceedsLimit:. It looks like one commit is bigger than the 5 mb cache limit. Please consider bringing this issue up either in the project's bugtracker on github or on the main Git mailing list (git at vger.kernel.org, see [1]) as the tool's author reads it. 1. http://vger.kernel.org/vger-lists.html#git -- 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] frustrations trying to control git through apache
Dear all, I am setting up an online documents system and have been trying to use git for the version control. That is to say, git works fine from the command line, but when I try to interface it with apache I keep getting 'bad file descriptor' and 'unable to create temporary file: No such file or directory' errors. Here is a typical output from the log file: : executing: cd /var/www/html/confix; echo $PATH 21; : output: /sbin:/usr/sbin:/bin:/usr/bin : executing: cd /var/www/html/confix; git init 21; : output: Initialized empty Git repository in /var/www/html/confix/.git/ : executing: cd /var/www/html/confix; git add * 21; : output: : executing: cd /var/www/html/confix; git commit -m 'first version' 21; : output: error: unable to create temporary file: No such file or directory Error building trees : executing: cd /var/www/html/confix; git clone /var/www/html/confix /var/www/html/saved/tom/var/www/html/confix 21 : output from clone: Cloning into '/var/www/html/saved/tom/var/www/html/confix'... fatal: read error: Bad file descriptor warning: You appear to have cloned an empty repository. fatal: write error: Broken pipe done. : executing: cd /var/www/html/saved/tom/var/www/html/confix; git commit -a -m '2013-07-10 12:52:52' 21; : output from commit: fatal: Not a git repository (or any of the parent directories): .git It seems to fall over at git commit -m 'first version' with 'unable to create temporary file'. Now I have no idea what temporary file it is trying to create or why it is unable to create it. (Can I get more detailed error messages somehow?) Of course this sequence works just fine from the command line. By the way I have tried (painstakingly/to the death!) file permissions. It is not these. All files belong to apache. I have also considered environment variables - that is mainly the $PATH environment variable (I am not sure what others could be involved. I couldnt find any reference to needing special environment variable settings to run git - aside from ensuring it could find the git binary itself - if anyone knows otherwise then please let me know). I have checked apache can access and write to that directory. It can. I am stuck as I have no idea what to do next. Can anyone at least point me in the direction of how to proceed from here? Some other info: I am calling git using perl 5.10, currently just using the backtick operator (though I was using Git::Wrapper, but no difference, same sort of errors occurring) Apache is 2.2.15 on CentOS 6.3. Let me know if you need any other info. Any help greatly 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] Windows 7 unable to run Git bash
I just Installed Git 1.8.3.2 My OS - Windows 7 home premium Everytime I open Git Bash. It show me the following error messages - sh.exe has stopped working. ( If this error shown the git close immediately ) - sed.exe has stopped working. - uname.exe has stopped working. Anyone having this issue? How to fix it? -- 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] bash SHA-1 completion
On Tue, 9 Jul 2013 11:23:13 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: [...] I suspect the reason that hash completion hasn't been done yet is more that it isn't very useful. If you type 8d40fc and auto-completion offers 8d40fc7e56eeb9ea725054822de5c8c145a65c 8d40fc088ee0223992617c6e45f0bae7915161 8d40fc0263d7cfc32017fdbf8cb9101613ab9c that won't prompt your memory, Ah, yes, 8d40fc088ee0223992617c6e45f0bae7915161 is the one I was looking for! In most modern systems, you use a hash only when you copy it from somewhere else, and there usually is a cut-and-paste functionality that allows you to do that. I think that cut-and-paste is what the OP would like to stop dealing with -- I, too, find it not very convenient to have to reach for the mouse to copy a SHA-1 name from a `git log` output which I, say, would like to run a rebasing operation on. Being able to tab-complete on SHA-1 names would require me just to memorize 2-3 leading digits from that name, type them and hit my completion key one or two times to be reassured I remembered correctly. Not that I desperately need a feature like this though... -- 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] frustrations trying to control git through apache
From: tomgra...@gmail.com : executing: cd /var/www/html/confix; echo $PATH 21; : output: /sbin:/usr/sbin:/bin:/usr/bin : executing: cd /var/www/html/confix; git init 21; : output: Initialized empty Git repository in /var/www/html/confix/.git/ : executing: cd /var/www/html/confix; git add * 21; : output: : executing: cd /var/www/html/confix; git commit -m 'first version' 21; : output: error: unable to create temporary file: No such file or directory Error building trees OK, all the errors after this seem to be due to this failure. I.e., since the repository is still empty, you can't clone it. (Why not, I wonder?) Since the clone failed, there is no repository for the next commit, etc. In regard to unable to create temporary file: No such file or directory, the question is where is Git attempting to create a temporary file? Often the default is /tmp, overridden by $TMPDIR. But creating temporary files usually depends on the execution environment. One approach would be to find the local version of trace, the program that prints out all the kernel calls made by an executable. On my system, it's called strace. (man -k trace will probably allow you to find it.) So you'd do something like: : executing: cd /var/www/html/confix; strace git commit -m 'first version' 21; Then near the bottom of the output, you'll see file system calls that attempt to create the file, and it will tell the name of the file that it's trying to create. Also, it's kind of a crock that Git has a file-related operation that fails, but Git's error message doesn't tell the name of the file it was trying to operate on. They should code better than that. And be prepared for a lot of output... Dale -- 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] git bisect fixed/unfixed option
On Jul 9, 2013 10:11 AM, Chemsi Mehdi chmsme...@gmail.com wrote: Dear Git expert, I wonder how adding to git bisect fixed/unfixed options. This in order to find a good patch fixing a bug and not to find the bad commit. This is helpful for me. I am working with git version 1.7.11.7 Can you please advise on how adding these commands to git bisect. Many thanks in advance. Mehdi Why don't you just write your test so that it fails if the bug does *not* occur? I.e., mark the commit as good if it has the bug, so that the first bad commit is the one that fixed it. -- 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] git error when trying to push one commit
I am trying to push just one commit to origin master. However I get an error saying I first need to fetch then merge, but I get this error after a pull. Any ideas would be appreciated. Richard@RICHARD-PC /e/Work/MH (master) $ git pull remote: Counting objects: 27, done. remote: Compressing objects: 100% (11/11), done. remote: Total 14 (delta 8), reused 0 (delta 0) Unpacking objects: 100% (14/14), done. From file:///V:\ 930430f..3a55dca master - origin/master Auto-merging buyit/src/main/java/com/company/buyit/outgoing/HttpsCallService.java Merge made by the 'recursive' strategy. .../java/com/company/buyit/auth/BcagHmacGenerator.java | 2 +- .../com/company/buyit/outgoing/HttpsCallService.java| 16 ++-- deployLocal.sh | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) Richard@RICHARD-PC /e/Work/MH (master) $ git push origin 72ba712:master To file:///V:\ ! [rejected]72ba712 - master (non-fast-forward) error: failed to push some refs to 'file:///V:\' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Here is the list of commits, not the position of 72ba712: Richard@RICHARD-PC /e/Work/MH (master) $ git lol * eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\ |\ | * 3a55dca (origin/master) comments * | 72ba712 comments * | bc55eb5 comments * | c2aa448 Merge branch 'master' of file:///V:\ |\ \ | |/ | * 930430f comments * | fc7a55b comments * | fd401a5 comments -- 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] git error when trying to push one commit
Hi Richard, what is the return of the command git remote show origin? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Jul 10, 2013 at 4:07 PM, Richard Marais richardmar...@gmail.comwrote: I am trying to push just one commit to origin master. However I get an error saying I first need to fetch then merge, but I get this error after a pull. Any ideas would be appreciated. Richard@RICHARD-PC /e/Work/MH (master) $ git pull remote: Counting objects: 27, done. remote: Compressing objects: 100% (11/11), done. remote: Total 14 (delta 8), reused 0 (delta 0) Unpacking objects: 100% (14/14), done. From file:///V:\ 930430f..3a55dca master - origin/master Auto-merging buyit/src/main/java/com/company/buyit/outgoing/HttpsCallService.java Merge made by the 'recursive' strategy. .../java/com/company/buyit/auth/BcagHmacGenerator.java | 2 +- .../com/company/buyit/outgoing/HttpsCallService.java| 16 ++-- deployLocal.sh | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) Richard@RICHARD-PC /e/Work/MH (master) $ git push origin 72ba712:master To file:///V:\ ! [rejected]72ba712 - master (non-fast-forward) error: failed to push some refs to 'file:///V:\' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Here is the list of commits, not the position of 72ba712: Richard@RICHARD-PC /e/Work/MH (master) $ git lol * eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\ |\ | * 3a55dca (origin/master) comments * | 72ba712 comments * | bc55eb5 comments * | c2aa448 Merge branch 'master' of file:///V:\ |\ \ | |/ | * 930430f comments * | fc7a55b comments * | fd401a5 comments -- 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. -- 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] Re: Problem removing large files from commit
Hey there. Not sure if this helps you, but this guide seems to be the best authority for removing files from the repository https://help.github.com/articles/remove-sensitive-data On Wednesday, July 10, 2013 3:30:46 PM UTC-5, Larry Martell wrote: I accidentally committed some large files, and when I pushed I got: remote: Error code: b68f56c6735645b9d397abe957c294d7 remote: warning: Error GH413: Large files detected. remote: warning: See http://git.io/iEPt8g for more information. remote: error: File app/cdsem/fixtures/cdsem_event_message_idx.json is 1162.76 MB; this exceeds GitHub's file size limit of 100 MB remote: error: File app/cdsem/fixtures/data_cst.json is 420.92 MB; this exceeds GitHub's file size limit of 100 MB remote: error: File app/cdsem/fixtures/data_eventlog.json is 2536.31 MB; this exceeds GitHub's file size limit of 100 MB To https://larrymart...@github.com/sobelk/MOTOR.git ! [remote rejected] unit_test - unit_test (pre-receive hook declined) error: failed to push some refs to ' https://larrymart...@github.com/sobelk/MOTOR.git' This was the first push for a new branch - I thought the push was done, just without these files, but it seems the brach was not created at all. I followed the directions at http://git.io/iEPt8g and did this: $ git rm --cached app/cdsem/fixtures/cdsem_event_message_idx.json app/cdsem/fixtures/data_cst.json app/cdsem/fixtures/data_eventlog.json rm 'app/cdsem/fixtures/cdsem_event_message_idx.json' rm 'app/cdsem/fixtures/data_cst.json' rm 'app/cdsem/fixtures/data_eventlog.json' $ git commit --amend -CHEAD [unit_test e8d0629] added more MeasData tests 4 files changed, 121616635 deletions(-) delete mode 100644 app/cdsem/fixtures/cdsem_event_message_idx.json delete mode 100644 app/cdsem/fixtures/data_cst.json delete mode 100644 app/cdsem/fixtures/data_eventlog.json Then I tried another push, but I got the same errors as before. How I can remove these files from the commit so I can push my branch? Thanks! -larry -- 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] git error when trying to push one commit
On Jul 10, 2013 12:07 PM, Richard Marais richardmar...@gmail.com wrote: ... Here is the list of commits, not the position of 72ba712: I've noted it. It's not a descendant of origin/master. Pushing it as origin/master would effectively discard 3a55dca. I believe what you want to do is cherry-pick 72ba712 onto a new branch based on the latest origin/master, then push that back to origin/master. Richard@RICHARD-PC /e/Work/MH (master) $ git lol * eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\ |\ | * 3a55dca (origin/master) comments * | 72ba712 comments * | bc55eb5 comments * | c2aa448 Merge branch 'master' of file:///V:\ |\ \ | |/ | * 930430f comments * | fc7a55b comments * | fd401a5 comments -- 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.
