Re: [git-users] New user gets lost driving the Git Bash
PS: The command like provided with Git for Windows is something like Bash for Linux. -- 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] New user gets lost driving the Git Bash
On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. [...] Note that you don't *have to* use Git bash: everything just works in the regular cmd.exe. Actually, the existence of Git bash is due to some parts of Git are written as Unix shell scripts so Git for Windows has to ship with a shell implementing POSIX semantics. There's no consensus in the Git for Windows community on what shell to use for interactive work with Git. I, for one, prefer cmd.exe as I tend to use the shell not only for Git. -- 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] git bugs reporting
On Tuesday, July 24, 2012 10:10:42 AM UTC+2, Konstantin Khomoutov wrote: I have tried to send mails to git at vger.kernel.org, as indicated by the git website, but all mails bounce back. I'm not sure, but you might have to be subscribed to it. See http://vger.kernel.org/vger-lists.html There are some rules laid down here: http://vger.kernel.org/majordomo-info.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/-/pfgbndirV98J. 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 is this a merge conflict?
On Tuesday, 24 July 2012 09:36:41 UTC+1, Hans Zorn wrote: After doing a merge of 2 branches in a Delphi project I get some merge conflicts. Some I understand are clearly conflicts as they are simply adverse. But many look like this example: HEAD === + Button13: TButton; + IBCustomerISACTIVE: TIBStringField; + DBCheckBox5: TDBCheckBox; + DBCheckBox6: TDBCheckBox; + IBStationISACTIVE: TIBStringField; + IBAccountISACTIVE: TIBStringField; + DBCheckBox7: TDBCheckBox; + IBCustomerSHOWPRICE: TIBStringField; + DBCheckBox8: TDBCheckBox; 51ae5a7d04e585b6785b4c5d0e84114298408a27 So my question is: what is conflicting here? Why does git not just copy the added lines of the second branch into HEAD? This happens if one side of the merge removed some lines, while the other side changed them. Let's set up an example: Create a new file with 3 lines $ echo -e initial line 1\ninitial line 2\ninitial line 3 file $ cat file initial line 1 initial line 2 initial line 3 $ git add file git commit -m Add initial lines [master (root-commit) 2e3cd57] Add initial lines 1 file changed, 3 insertions(+) create mode 100644 file Then we'll branch, and modify these lines $ git checkout -b branch Switched to a new branch 'branch' $ echo -e modified line 1\nmodified line 2\nmodified line 3 file $ cat file modified line 1 modified line 2 modified line 3 $ git commit -am Add modified lines [branch 9c42865] Add modified lines 1 file changed, 3 insertions(+), 3 deletions(-) Meanwhile on master, we'll remove those lines $ git checkout master Switched to branch 'master' $ cat /dev/null file $ git commit -am Remove lines from file [master f008f71] Remove lines from file 1 file changed, 3 deletions(-) Then we'll try and merge the two versions together $ git merge branch Auto-merging file CONFLICT (content): Merge conflict in file Automatic merge failed; fix conflicts and then commit the result. $ cat file HEAD === modified line 1 modified line 2 modified line 3 branch As you can see, the HEAD side removed the lines (which is shown by the HEAD section being empty), while the branch side modified the lines, which is also shown. It might be easier to see if we use the 'diff3' style conflict markers, which also shows the original version (see diff.conflictstyle in man git-config). $ git merge --abort $ git -c merge.conflictstyle=diff3 merge branch Auto-merging file CONFLICT (content): Merge conflict in file Automatic merge failed; fix conflicts and then commit the result. $ cat file HEAD ||| merged common ancestors initial line 1 initial line 2 initial line 3 === modified line 1 modified line 2 modified line 3 branch Here, git shows you the original lines (between the and ), so it's easier to see the modifications that each branch did to the original. Hope that clears things up, Antony -- 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/-/5ZoThySu_o8J. 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 is this a merge conflict?
Thank you for this reaction. I can follow what you write and it is clear to me that by doing what you did, the situation I described can emerge. But the thing is: there were no deletes. Head does not contain certain lines that the branch to merge in does. So the lines in the branch to merge are just new- that's all! Any ideas? Hans Op dinsdag 24 juli 2012 13:31:54 UTC+2 schreef Antony het volgende: On Tuesday, 24 July 2012 09:36:41 UTC+1, Hans Zorn wrote: After doing a merge of 2 branches in a Delphi project I get some merge conflicts. Some I understand are clearly conflicts as they are simply adverse. But many look like this example: HEAD === + Button13: TButton; + IBCustomerISACTIVE: TIBStringField; + DBCheckBox5: TDBCheckBox; + DBCheckBox6: TDBCheckBox; + IBStationISACTIVE: TIBStringField; + IBAccountISACTIVE: TIBStringField; + DBCheckBox7: TDBCheckBox; + IBCustomerSHOWPRICE: TIBStringField; + DBCheckBox8: TDBCheckBox; 51ae5a7d04e585b6785b4c5d0e84114298408a27 So my question is: what is conflicting here? Why does git not just copy the added lines of the second branch into HEAD? This happens if one side of the merge removed some lines, while the other side changed them. Let's set up an example: Create a new file with 3 lines $ echo -e initial line 1\ninitial line 2\ninitial line 3 file $ cat file initial line 1 initial line 2 initial line 3 $ git add file git commit -m Add initial lines [master (root-commit) 2e3cd57] Add initial lines 1 file changed, 3 insertions(+) create mode 100644 file Then we'll branch, and modify these lines $ git checkout -b branch Switched to a new branch 'branch' $ echo -e modified line 1\nmodified line 2\nmodified line 3 file $ cat file modified line 1 modified line 2 modified line 3 $ git commit -am Add modified lines [branch 9c42865] Add modified lines 1 file changed, 3 insertions(+), 3 deletions(-) Meanwhile on master, we'll remove those lines $ git checkout master Switched to branch 'master' $ cat /dev/null file $ git commit -am Remove lines from file [master f008f71] Remove lines from file 1 file changed, 3 deletions(-) Then we'll try and merge the two versions together $ git merge branch Auto-merging file CONFLICT (content): Merge conflict in file Automatic merge failed; fix conflicts and then commit the result. $ cat file HEAD === modified line 1 modified line 2 modified line 3 branch As you can see, the HEAD side removed the lines (which is shown by the HEAD section being empty), while the branch side modified the lines, which is also shown. It might be easier to see if we use the 'diff3' style conflict markers, which also shows the original version (see diff.conflictstyle in man git-config). $ git merge --abort $ git -c merge.conflictstyle=diff3 merge branch Auto-merging file CONFLICT (content): Merge conflict in file Automatic merge failed; fix conflicts and then commit the result. $ cat file HEAD ||| merged common ancestors initial line 1 initial line 2 initial line 3 === modified line 1 modified line 2 modified line 3 branch Here, git shows you the original lines (between the and ), so it's easier to see the modifications that each branch did to the original. Hope that clears things up, Antony -- 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/-/z3favmoFfdYJ. 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] how to git format patch without swith to that branch
On Tue, Jul 24, 2012 at 7:53 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Tuesday, July 24, 2012 7:05:14 AM UTC+2, lei yang wrote: how to? If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this, but I don't know how to fromat it with commit without switching to B eg: git format-patch commit1..commit2, but How could I could I format branch B's? The dot-dot (..) notation specifies a range from B-minus-two to B-head. -- 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/-/T-UD6NjibKEJ. 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: Bug? status --porcelain only quotes spaces in added files
On Tuesday, 24 July 2012 04:19:49 UTC-7, Thomas Ferris Nicolaisen wrote:
On Tuesday, July 24, 2012 12:29:22 AM UTC+2, Graham Jans wrote:
Consider this scenario:
$ touch a 1.txt
$ touch a 2.txt
$ git add a 1.txt
$ git status --porcelain
A a 1.txt
?? a 2.txt
Note that the added file is properly quoted to account for the space, but
the unadded file is not.
This makes these scenarios incredibly troublesome to parse with scripts,
etc. As well, this behaviour just seems inconsistent.
I am using *1.7.11.msysgit.0*.
Can someone suggest a next step or an easy shell-based bandaid for this
scenario?
Can you perhaps show us the part of the script where this is causing
problems? Perhaps some script-wizard here on the list can make it work for
you.
I imagine either of those lines could be parsed into 2 columns using some
clever regular expression (first column status, and the second column
filename), and then the second column can be eval'ed somehow into a string
where the quotes are dropped.
I'm using a fairly standard one-line 'add all' bit, like this:
git status --porcelain | egrep ^\? | awk '{print $2}' | xargs git add
Also, I have solved my present issue through brute force; I'm more
concerned at this point about the general inconsistent behavior here.
--
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/-/S3r__O815ooJ.
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: Bug? status --porcelain only quotes spaces in added files
On 07/24/12 12:07, Graham Jans wrote: On Tuesday, 24 July 2012 04:37:47 UTC-7, Tim Chase wrote: $ touch a 1.txt $ touch a 2.txt $ touch 'a 3.txt' $ git add a 1.txt $ git status --porcelain A a 1.txt ?? \a 3.txt\ ?? a 2.txt == Yeah, so in your case, the behavior is at least consistent: it doesn't put quotes around filenames in spaces in either the 'a 1' or 'a 2' case. (In the case of 'a 3'... that's just odd, I've never seen anyone put quotes _in_ a filename before! ;) ) I believe that on Posix systems, any ASCII character other than / and NUL can appear in a filename, so it can create all manner of problems when your filename has sociopathic newlines, tabs, escape (gotta love ANSI escape sequences in filenames), quotes, backticks, etc. -tkc -- 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] New user gets lost driving the Git Bash
Continued thanks for all the help. I'm sorry to be so slow at this...I've just done very little command line operation in the past and probably shouldn't even be allowed near computers at all. I have very little experience on Linux/Unix as well, so I'm really floundering around in the dark here. I learned ls yesterday though, so I'm getting there. So when you say cmd.exe you're talking about just a normal windows command line prompt? Like you go to Start and type cmd? I tried that initially but only got errors (e.g. $ not recognized). Wasn't until I stumbled on the Git Bash thing that I could make Git work at all. I know there are GUI's available, but I have a big desire to develop some command line skills and this seems like a reasonable place to start. I figured how to commit files yesterday! Woo hoo! All that seemed to go reasonably well until I did the diff command, which had me lost until I finally typed h and got the help screen. On Tuesday, July 24, 2012 12:46:44 AM UTC-7, Konstantin Khomoutov wrote: On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. [...] Note that you don't *have to* use Git bash: everything just works in the regular cmd.exe. Actually, the existence of Git bash is due to some parts of Git are written as Unix shell scripts so Git for Windows has to ship with a shell implementing POSIX semantics. There's no consensus in the Git for Windows community on what shell to use for interactive work with Git. I, for one, prefer cmd.exe as I tend to use the shell not only for Git. -- 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/-/ZTmFPr90CvoJ. 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] how to git format patch without swith to that branch
On Tuesday, July 24, 2012 5:11:04 PM UTC+2, lei yang wrote: If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this, but I don't know how to fromat it with commit without switching to B eg: git format-patch commit1..commit2, but How could I could I format branch B's? You don't have to switch to branch B to do the above command. You can do it on any branch you like, and still get patch files from branch B. -- 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/-/5YvaKVdPYsMJ. 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] how to git format patch without swith to that branch
On Tuesday, July 24, 2012 5:11:04 PM UTC+2, lei yang wrote: If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this, but I don't know how to fromat it with commit without switching to B eg: git format-patch commit1..commit2, but How could I could I format branch B's? You don't have to switch to branch B to do the above command. You can do it on any branch you like, and still get patch files from branch B. -- 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/-/kokB3LS4VMIJ. 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: Commits only from specific branch
BUT (there is always some), when i decide to clone Project i get newProject where is again submodule with all commits (not only master branch specific). Well, that's odd. I would think that when you clone submoduleX.git, it only brings in the commits that exist on the remote side. Can you show exactly which steps you are doing to set this up? -- 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/-/HW_AjhVDNugJ. 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: Out of memmory, malloc failed. with large files using Gitolite on a VPS
On Saturday, July 21, 2012 12:20:48 AM UTC+2, EJ Etherington wrote: Greetings, I've been using git for a while but am fairly new to setting up a central shared point like gitolite. I am able to arbitrarily create small repository but have run into trouble migrating existing repositories to gitolite. This seems entirely due to a combination of two things. Very large individual files in the history, binary and text files (such as mysql dumps), and the lack of swap space on my inMotion VPS. The VPS should have 1G memory with about 700MB free at any given time. When I create a new repository on the server and clone to my desktop all is well. When I experimented with progressively larger file sizes, it breaks unrecoverably (as far as I can tell) when I get to 1GB text file sizes. Once I get to that size, I get out of memory errors when cloning and bad pack errors when pushing. I have tried all manner of sizes for the pack.windowMemory, pack.threads, pack.window, depth, deltaCacheSize packedGitWindowSize etc. I have spent all of this past week researching and have found nothing that helped. Can anyone suggest something that, perhaps I have not tried? I think the only thing you can do is to find some way to keep these huge files outside your repository. Adding files that are bigger than your available memory sounds like a really bad idea. Perhaps something like git-annex http://git-annex.branchable.com/ could help. -- 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/-/nDZacdmlExsJ. 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] New user gets lost driving the Git Bash
On Tuesday, 24 July 2012 00:46:44 UTC-7, Konstantin Khomoutov wrote: On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. [...] Note that you don't *have to* use Git bash: everything just works in the regular cmd.exe. Actually, the existence of Git bash is due to some parts of Git are written as Unix shell scripts so Git for Windows has to ship with a shell implementing POSIX semantics. There's no consensus in the Git for Windows community on what shell to use for interactive work with Git. I, for one, prefer cmd.exe as I tend to use the shell not only for Git. As Konstantin says, there's no consensus. However, I recommend using Git Bash, as it makes utilizing small script snippets etc. that you find around the net more accessible (because you don't have to translate them to windows-style, can just use them in the unix-style presented. As well, getting the various bits of Git Bash to work in cmd.exe requires choosing the correct options when installing; the installer has a big red warning here so most people choose not to do that. As well, the coloring doesn't work for me in cmd.exe. So all in all I recommend using Git Bash at least for learning. -- 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/-/cf-PGK6z3AUJ. 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: svn to git question
Hi Tomas - it appears to be working fine with grafting. thanks a lot for that. there is one issue though : seems like I have duplicate commits. these are the latest ones and not the old ones I fetched from the older repository. one part of the commits starts at remote/origin/master, and the other one starts at master. sha1 nums are different ones of course. since I followed the instructions I was wondering how it happened and if should I remove the duplicated ones with rebase -i now. On Saturday, July 21, 2012 12:29:47 AM UTC+3, Gabby Romano wrote: Thanks for the advice. really helps. One more thing if I may - if I want to distinguish the old file versions prior to stitch the data, should I be using tags for it ? is it like a label in other systems and it need to be applied on all files participating in the process. On Fri, Jul 20, 2012 at 10:22 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Friday, July 20, 2012 2:36:07 PM UTC+2, Gabby Romano wrote: Thanks Tomas. I have decided to do it the right way now as described in your site. I have cloned svn from an earlier revision and will try to make my way up from there. anything I should be aware of before stitching all together ? I am only ~ month with git so not sure yet about where all the traps may lie. if it's as simple as you describe in your site I might be OK. Well, just try it out and see how it goes. Maybe it will save you some time if you take care and plan exactly which svn revisions you have to stitch together. Also, before you start grafting and filter-branching, make an extra clone of the repository you are working on, in case you have to start over. And note down the commands you are using, in case you want to trace back your steps. -- 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/-/VR3rhB5LonEJ. 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 view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/owyM-LoZsEQJ. 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] First Attempt to Import from SVN Fails
Just tried a test import from SVN and ran into an error: git svn clone --stdlayout svn url returns... Can't locate Git/SVN/Editor.pm in @INC @INC contains: /lib /usr/lib/per15/5.8.8/msys /usr/lib/per15/5.8.8 /usr/lib/per15/site_perl/5.8.8/msys /usr/lig/per15/site_perl/5.8.8 /usr/lib/perl15/site_perl .) at C:\Program Files (x86)\Git/libexec/git-cor\git-svn line 81. BEGIN failed--compilation aborted at C:\Program Files (x86)\Git/libexec/git-core\git-svn line 81. -- 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/-/WxQCgd6FdDIJ. 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.
