git config --global not picking up includes

2015-01-19 Thread Jim Garrison
I have found that `git config --global` does not pick up any include 
directives in the git config file.


For instance, my ~/.gitconfig contains the following:

[include]
path = /home/garrison/gitconfig-include

And ~/gitconfig-include in turn contains

[user]
name = Jim Garrison

However, when I pass the --global flag to git config, my name is not 
picked up:


$ git config --global user.name
$ git config user.name
Jim Garrison

If I instead replace .gitconfig with the contents of gitconfig-include 
(and in turn remove the include step), everything works as expected.


$ git config --global user.name
Jim Garrison
$ git config user.name
Jim Garrison

I am using the latest git master, built on Debian jessie.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Beginner question on Pull is mostly evil

2014-05-07 Thread Jim Garrison
During my initial self-education I came across the maxim don't pull, 
fetch+merge instead and have been doing that.  I think I followed most of the 
pull is (mostly) evil discussion but one facet still puzzles me: the idea 
that pull will do a merge in the wrong direction sometimes.

Do I understand correctly that this occurs only in the presence of multiple 
remotes?  
Can someone provide a simple example of a situation where pull would do the 
wrong thing?

Thanks

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: Beginner question on Pull is mostly evil

2014-05-07 Thread Jim Garrison
 -Original Message-
 From: Junio C Hamano
 Sent: Wednesday, May 07, 2014 1:16 PM
 Subject: Re: Beginner question on Pull is mostly evil
 
 No.  This is most often true for people who use a single repository as a
 place for everybody to meet, in the same way as SVN.
[snip lots of excellent detail]
 HTH.

Wow.  That helps tremendously, and should be incorporated somewhere in the
Git documentation.  Thank you for your immensely detailed response.

Apologies about not breaking lines... I'll remember that in future.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: Want to start using Git on my windows 7 system.

2014-03-21 Thread Jim Garrison
 -Original Message-
 Behalf Of Izundu Kingsley
 Sent: Friday, March 21, 2014 8:08 AM
 Subject: Want to start using Git on my windows 7 system.
 
 Good Afternoon, am very curious about how powerful git can serve
 programmers and computer users. I will be glad if am helped with the git
 installation files, that is the files I will need to get git on my system and 
 some
 hand-on materials for a quick get along. I will like to teach other of my 
 friends
 about this as well. Thanks, I appreciate your pending assistance...Kingsley
 Sent from my BlackBerry wireless device from MTN

Start here: http://git-scm.com/book

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: Globbing for ignored branches?

2014-01-24 Thread Jim Garrison
 -Original Message-
 Behalf Of Markus Trippelsdorf
 Sent: Friday, January 24, 2014 1:01 AM
 Subject: Globbing for ignored branches?
 
 I would like to ignore branches that match a certain pattern, e.g.:
[snip]
 
 Is it possible to ignore all branches that match hjl?
 

If you mean ignore them when you do git branch -a, then

git branch -a |grep -v hjl

If you mean ignore in some other scenario you need to be more specific about 
what you want.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: Problem importing from SVN repository with branches/tags at multiple levels using git-svn

2014-01-22 Thread Jim Garrison
 -Original Message-
 Behalf Of Robert Hancock
 Sent: Wednesday, January 22, 2014 11:03 AM
 Subject: Re: Problem importing from SVN repository with branches/tags at
 multiple levels using git-svn
 
 On 01/15/2014 02:10 PM, Robert Hancock wrote:
  We have an SVN repository that has a structure for tags (likewise for
  branches) like this:
 
  tags/tag1
  tags/tag2
  tags/tag3/
  tags/subdir/tag4
  tags/subdir/tag5
 
[snip]

We did this recently and decided there is only one way to do it reliably.

Copy all the tags, within subversion itself, into the structure expected by 
git, then use git svn following the procedures outlined in the manual.

Copying tags is cheap in subversion, and you can always delete them afterwards 
if you want.


Suggestion for git reference page

2013-11-19 Thread Jim Garrison
The master reference TOC page at http://git-scm.com/docs links to all the 
associated command reference pages, except it seems to be missing a link for 
gitrevisions(7) (http://git-scm.com/docs/gitrevisions.html).

I've never submitted a patch and thought I would learn how... except the 
website source doesn't seem to be in the git source tree.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: git svn clone with funky tags layout

2013-11-06 Thread Jim Garrison
 -Original Message-
 From: Michael J Gruber [mailto:g...@drmicha.warpmail.net]
 Sent: Wednesday, November 06, 2013 6:03 AM
 To: Jim Garrison; git@vger.kernel.org
 Subject: Re: git svn clone with funky tags layout
 
 Jim Garrison venit, vidit, dixit 05.11.2013 18:16:
  I'm doing a one-time migration of an svn project.  For historical reasons
 our repo layout is weird:
 
  trunk/reporting/reporting_app
 
  tags/something_else
  
  tags/reporting_app-2.3.45
  tags/reporting_app-2.4.46
  tags/reporting_app-2.4.0
  tags/reporting_app-2.4.1
  
  tags/more_stuff
 
  I want to migrate the trunk plus only the 2.4.* tags.  I tried giving
  a wildcard in the config
 
  [svn-remote svn]
  noMetadata = 1
  url = http://subversion.tld.com/svn/DevJava
  fetch = trunk/Reporting/reporting_app:refs/remotes/trunk
  tags = tags/reporting_app-2.4.*:refs/remotes/tags/*
 
  but this does not work:
 
  Invalid pattern in 'tags/reporting_app-2.4.*': reporting_app-2.4.*
 
  On the off chance that it might work I also tried
 
  tags =
  tags/reporting_app-2.4.*:refs/remotes/tags/reporting_app-2.4.*
 
  but that produces the same error message.
 
  Is there a way to accomplish this or should I just move the tags I want to
 import into a separate directory in subversion first?  I'd rather not disturb
 svn but can do that if it's the only way.
 
 
 Depending on whether there are more tags to skip or more to include, you
 can
 
 A) use the standard refspec (--tags=tags/) and remove the superfluous tag
 branches once git-svn is finished or
 
 B) use multiple tag refspecs without wildcard:
 
 tags = tags/reporting_app-2.4.0:refs/remotes/tags/2.4.0
 tags = tags/reporting_app-2.4.1:refs/remotes/tags/2.4.1
 
 I may have mixed up A and B ;)

Thanks for the response. Since there was a lot of reorganization to be done I 
decided to just copy all the disparate directories into a new correctly 
structured  tree in svn first, and import from there.  Worked great.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


git svn clone with funky tags layout

2013-11-05 Thread Jim Garrison
I'm doing a one-time migration of an svn project.  For historical reasons our 
repo layout is weird:

trunk/reporting/reporting_app

tags/something_else

tags/reporting_app-2.3.45
tags/reporting_app-2.4.46
tags/reporting_app-2.4.0
tags/reporting_app-2.4.1

tags/more_stuff

I want to migrate the trunk plus only the 2.4.* tags.  I tried giving a 
wildcard in the config

[svn-remote svn]
noMetadata = 1
url = http://subversion.tld.com/svn/DevJava
fetch = trunk/Reporting/reporting_app:refs/remotes/trunk
tags = tags/reporting_app-2.4.*:refs/remotes/tags/*

but this does not work:

Invalid pattern in 'tags/reporting_app-2.4.*': reporting_app-2.4.*

On the off chance that it might work I also tried

tags = 
tags/reporting_app-2.4.*:refs/remotes/tags/reporting_app-2.4.*

but that produces the same error message.

Is there a way to accomplish this or should I just move the tags I want to 
import into a separate directory in subversion first?  I'd rather not disturb 
svn but can do that if it's the only way.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


git svn clone reprocessing old commits many times?

2013-10-30 Thread Jim Garrison
I'm trying to clone an svn repository to git in preparation for a migration to 
git, including all branches and tags.

The clone is taking a long time, and it looks like every time it detects a 
possible branch point it backs up and reprocesses a bunch of old commits.  For 
example:

r43224 = f308bd7765f9923143f3883a903aebf9ac70aa42 
(refs/remotes/tags/etl_app_project-2.1.3@43224)
Found branch parent: (refs/remotes/tags/etl_app_project-2.1.3) 
f308bd7765f9923143f3883a903aebf9ac70aa42
Following parent with do_switch
Successfully followed parent
r43225 = 0beb90a63bd0abb552ac3d36c304649dc03c402f 
(refs/remotes/tags/etl_app_project-2.1.3)
Found possible branch point: http://svn-server:81/svn/DevJava/trunk/ETL/etl_app 
= http://svn-server:81/svn/DevJava/trunk/etl_app, 44876
Initializing parent: refs/remotes/trunk@44876
r1296 = 39f1370bef9b75a5848c184befa47b999d0db73a (refs/remotes/trunk@44876)
W: +empty_dir: trunk/ETL/etl_app/src
r1697 = a68b473c64a80882c7b665fb128a12dfa8e9c355 (refs/remotes/trunk@44876)
W: +empty_dir: trunk/ETL/etl_app/src/main
r1698 = e18bd0b80ed9dd398d49bff04ca9650292f2f36d (refs/remotes/trunk@44876)

I don't understand why, for each possible branch/tag, it has to go all the way 
back to such an old commit and start over again.

Is this normal or is something amiss?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Documentation for fetch, url, branches, tags keywords in git config?

2013-10-29 Thread Jim Garrison
A typical config

[svn-remote svn]
noMetadata = 1
url = http://repository.url/svn
fetch = trunk/etl_app:refs/remotes/etl_app/trunk
branches = branches/etl_app/*:refs/remotes/branches/*
tags = tags/etl_app/*:refs/remotes/tags/*


However, the manpage for git-config(1) does not include anything exlicit on 
url, fetch, branches, 'tags, and the meaning of the syntax following the 
colon. 

Where can I find this info?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: Documentation for fetch, url, branches, tags keywords in git config?

2013-10-29 Thread Jim Garrison
I've already read that manpage.  It does not describe the meaning of fetch, 
branches and tags, and the significance of the :refs/remotes/branches/* 
syntax.

 -Original Message-
 From: Fredrik Gustafsson [mailto:iveqy.mail...@gmail.com] On Behalf Of
 Fredrik Gustafsson
 Sent: Tuesday, October 29, 2013 12:37 PM
 To: Jim Garrison
 Cc: git@vger.kernel.org
 Subject: Re: Documentation for fetch, url, branches, tags keywords in git
 config?
 
 On Tue, Oct 29, 2013 at 07:23:20PM +, Jim Garrison wrote:
  A typical config
 
  [svn-remote svn]
  noMetadata = 1
  url = http://repository.url/svn
  fetch = trunk/etl_app:refs/remotes/etl_app/trunk
  branches = branches/etl_app/*:refs/remotes/branches/*
  tags = tags/etl_app/*:refs/remotes/tags/*
 
 
  However, the manpage for git-config(1) does not include anything exlicit on
 url, fetch, branches, 'tags, and the meaning of the syntax following
 the colon.
 
  Where can I find this info?
 
 Is the info in here what you're looking for?
 http://jk.gs/git-svn.html
 
 --
 Med vänliga hälsningar
 Fredrik Gustafsson
 
 tel: 0733-608274
 e-post: iv...@iveqy.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html