[git-users] Re: rev-parse --is-inside-work-tree never returns false?

On 01/15/13 00:25, Thomas Ferris Nicolaisen wrote: On Tuesday, January 15, 2013 3:24:34 AM UTC+1, Tim Chase wrote: However, when I try "git rev-parse --is-inside-work-tree" outside my repo, I get fatal: Not a git repository (or any parent up to mount point /home) Stopping at

[git-users] rev-parse --is-inside-work-tree never returns false?

I was playing around with some of the information that rev-parse can return and just tried --is-inside-work-tree to see what it would return. As expected, in my working-dir $PROJ, it returns "true". Same for within $PROJ/.git and $PROJ/dir_with_nothing_tracked However, when I try "git rev-par

[git-users] Re: git - svn migration question

On 12/20/12 02:22, Thomas Ferris Nicolaisen wrote: > On Thursday, December 20, 2012 5:35:56 AM UTC+1, Daniel Pomerantz wrote: >> git svn clone --authors-file=users.txt --no-metadata -s >> > > Any reason why you are not using the --stdlayout argument? This is key for > converting a standard lay

[git-users] Re: GIT actions from bugzilla server to origin

On 12/05/12 05:37, Konstantin Khomoutov wrote: > On Tue, 4 Dec 2012 10:43:32 -0800 (PST) > Jeffrey Marans wrote: > >> I'm working on transitioning about 15 CVS modules to GIT repositories >> and I think I've got a handle on how to translate the cvs triggers to >> make them run on the git origin.

[git-users] Re: /opt/git folder

On 11/22/12 06:28, Konstantin Khomoutov wrote: > So, to answer the original question, Git *might* be installed > under /opt, when doing manual compilation, but this is somewhat odd due > to a number of reasons--it's always better to first try installing Git > from a ready-made binary package. Ever

[git-users] Re: is it possible to make ``git add --patch`` use arbitrary diffs?

On 11/02/12 10:15, Andrej wrote: > ``git add -p`` allows to interactively decide what is to be staged. It > shows hunks of code to you much like ``git diff`` would do. The question > is: is it possible somehow to interactively stage arbitrary differences > other than diffs between working tree

[git-users] Re: Why do I have to be a source control engineer just to be a software developer?

On 10/29/12 17:31, kramer.newsreader wrote: > I am a fairly experienced developer and I have never had issues working > with source control tools before git. > > I take a new job. I am working with git. I am thinking about quitting > over having to use it. I'll admit that I too took about 4 o

[git-users] Re: Beginner trying to understand the stash - how pop and apply affect the current branch you are on.

On 10/23/12 12:56, Kayatta Schmidt wrote: > 1. I have checked out a branch, let's call it "*branchA*" and made some > changes. > 2. The QA team comes back with some priority 1 bug fixes and so I must > quickly stash my changes and switch over to "*branchB*." Let's assume I > use the following c

[git-users] More details on merge-driver=union

I've read the somewhat sparse documentation in gitattributes(5) on the "union" merge driver, but on #git I was cautioned that there may be unexpected behaviors. My use-case is to consolidate (usually[*]) append-only mbox files that might "conflict" when different messages are added within various

[git-users] Re: how to to check if a branch has changes not present in master?

On 08/28/12 05:47, Tim Chase wrote: > On 08/28/12 03:13, Fred wrote: >> is there a way to check if a branch doesn't introduce changes, >> which are not in master. > > I'm partial to > > git diff my_branch ^master > > which would find all the changes

[git-users] Re: how to to check if a branch has changes not present in master?

On 08/28/12 03:13, Fred wrote: > is there a way to check if a branch doesn't introduce changes, > which are not in master. I'm partial to git diff my_branch ^master which would find all the changes on "my_branch" that aren't yet on master. This is an open syntax so you can request "changes th

[git-users] Git bug-flow

I've been playing around with trying to keep some basic bug and feature-request tracking information in git alongside my project and was wondering how other folks have been doing this. My current workflow is something like 1) alongside my src/ and docs/ directories, create a todo/ directory cont

Re: [git-users] misleading diff hunk-header

On 08/21/12 07:19, Konstantin Khomoutov wrote: > On Mon, 20 Aug 2012 20:49:48 -0500 > Tim Chase wrote: >> tl;dr version: diff.{type}.xfuncname starts searching backwards in >> from the beginning of the hunk, not the first differing line. > > This list is for helping inexp

[git-users] misleading diff hunk-header

tl;dr version: diff.{type}.xfuncname starts searching backwards in from the beginning of the hunk, not the first differing line. $ mkdir tmp $ cd tmp $ git init $ cat > foo.c

[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-users] Re: Bug? "status --porcelain" only quotes spaces in added files

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

[git-users] Re: Creating an initial git repository

On 07/19/12 06:54, P Rouleau wrote: > I suggest to read http://hginit.org that URL was failing for me. I presume you mean http://hginit.com -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] Re: Marking code blocks consistently ignored for add/commit

On 07/08/12 11:13, Lars Pensjö wrote: > I think this is a common problem. You have changes in the code > that you do not want to check in. I use "git gui" for this. It is > easy to select what hunks, or even individual lines, that shall > be included in the index. As mentioned, I currently just u

[git-users] Re: Marking code blocks consistently ignored for add/commit

On 07/06/12 14:07, Les Nightingill wrote: > is it possible to pull all the test-only pieces of code from a "test_only" > file, that is ignored by git. Include the test code in such a way that if > the "test_only" file is not present, the production code still holds > together. Because the test

[git-users] Marking code blocks consistently ignored for add/commit

I've got a number of Python modules where the debugging code changes on a regular basis, but is of no relevance to the history of the file. For a snippet, it might be something like def real_code(x): return do_stuff(x) # version everything above the next line

[git-users] Re: how to merge to separate repositories.

On 06/28/12 13:44, Philip Oakley wrote: > You can use Grafts Always happy to learn new git tricks. Thanks! This is a far better solution than my rebasing, though with similar (albeit easier and cleaner) results if you plan to push anywhere. >From what I read, the grafting doesn't get pushed, so

[git-users] Re: how to merge to separate repositories.

On 06/28/12 12:57, Nicolas Bock wrote: > I checked out the most recent version from CVS and made that the > initial commit of our git repository. This unfortunately meant > that we lost all history prior to the switch. > > We would now like to add that missing history into git. I > converted the C

[git-users] Re: Amending a commit into different branches

On 06/20/12 23:53, PJ Weisberg wrote: >> Not sure what happened there...according to my Sent folder, they >> went out from Thunderbird on my end as monospace/plaintext and based >> on what I see in gmane, it came out correctly there. Sorry if >> something was set wrong. > > It couldn't be in mono

[git-users] Re: Amending a commit into different branches

On 06/19/12 07:52, Thomas Ferris Nicolaisen wrote: > I took the liberty of monospacing your ascii-art below: > > master dev >> | | >> v v >> A ---> B ---> C Not sure what happened there...according to my Sent folder, they went out from Thunderbird on my end as mo

[git-users] Amending a commit into different branches

In playing around on scenarios in which I often find myself, I have the following repo: master dev | | v v A ---> B ---> C In an ideal world, the commit path would have had parts of the "C" commit split into several bugfix branches instead of directly committing on d