Limiting disk usage

2013-10-29 Thread Piotr Krukowiecki
Hi, What can be done to limit amount of space occupied on clone and checkout? I know about shallow clone and sparse checkout, anything else? Preferably I would split repository into multiple repositories but I worry that working with multiple directories would be much more troublesome. But

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-29 Thread Christian Couder
On Mon, Oct 28, 2013 at 3:46 AM, Johan Herland jo...@herland.net wrote: On Sun, Oct 27, 2013 at 8:04 PM, Christian Couder christian.cou...@gmail.com wrote: If git commit processes these arguments and puts the result in the commit message file that is passed to the prepare-commit-msg hook,

git svn already set … wanted to set to:

2013-10-29 Thread DimanNe
I am trying to clone/fetch svn branch with git-svn: git config --add svn-remote.stable-2012-03-29.url https://some_host/branch git config --add svn-remote.stable-2012-03-29.fetch :refs/remotes/stable-2012-03-29 git svn fetch stable-2012-03-29 which gives me this error message:

[PATCH v2 7/7] Documentation/gitk: document -L option

2013-10-29 Thread Thomas Rast
The -L option is the same as for git-log, so the entire block is just copied from git-log.txt. Signed-off-by: Thomas Rast t...@thomasrast.ch --- Documentation/gitk.txt | 12 1 file changed, 12 insertions(+) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index

[PATCH v2 3/7] gitk: split out diff part in $commitinfo

2013-10-29 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch So far we just parsed everything after the headers into the comment bit of $commitinfo, including notes and -- if you gave weird options -- the diff. Split out the diff, if any, into a separate field. It's easy to recognize, since it always starts with

[PATCH v2 2/7] gitk: refactor per-line part of getblobdiffline and its support

2013-10-29 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch For later use with data sources other than a pipe, refactor the big worker part of getblobdiffline to a separate function parseblobdiffline. Also refactor its initialization and wrap-up to separate routines. Signed-off-by: Thomas Rast tr...@inf.ethz.ch ---

[PATCH v2 6/7] Documentation: put blame/log -L in sticked form

2013-10-29 Thread Thomas Rast
The next patch will document gitk -L, but gitk does not understand the separated form ('gitk -L :foo:bar' results in an error). Spell git-blame and git-log -L, which are supposed to be the same option, without the spaces to prevent confusion. Signed-off-by: Thomas Rast t...@thomasrast.ch ---

[PATCH v2 1/7] gitk: support -G option from the command line

2013-10-29 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- gitk-git/gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index

[PATCH v2 4/7] gitk: support showing the gathered inline diffs

2013-10-29 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch The previous commit split the diffs into a separate field. Now we actually want to show them. To that end we use the stored diff, and - process it once to build a fake tree diff, i.e., a list of all changed files; - feed it through parseblobdiffline to

[PATCH v2 5/7] gitk: recognize -L option

2013-10-29 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch This gives line-log support to gitk, by exploiting the new support for processing and showing inline diffs straight from the git-log output. Note that we 'set allknown 0', which is a bit counterintuitive since this is a known option. But that flag prevents

[PATCH v2 0/7] gitk -L

2013-10-29 Thread Thomas Rast
Thomas Rast wrote: Jonathan Nieder wrote: Support for just the sticked form is better than nothing, especially if the gitk(1) manpage gains a note about it. In the long run I guess the ideal would be to add a parse-options-like library to the tcl support. Ok. I'm generally not happy

Re: git svn already set … wanted to set to:

2013-10-29 Thread Thomas Rast
DimanNe dima...@ya.ru writes: I am trying to clone/fetch svn branch with git-svn: git config --add svn-remote.stable-2012-03-29.url https://some_host/branch git config --add svn-remote.stable-2012-03-29.fetch :refs/remotes/stable-2012-03-29 git svn fetch stable-2012-03-29 which gives me

links of london sweetie bracelet sale Available for sale

2013-10-29 Thread dsfhgjh11
The unique flexible links of london necklaces sale http://www.linksoflondonvipsale.co.uk/is usually just one area of anklet bracelets and the majority probably really the only ring within a female's anklet bracelets variety at least 18 could possibly for no reason receive cleared of.

links of london friendship bracelet sale during this internet is rather low-priced on sale

2013-10-29 Thread dsfhgjh11
Maybe you can never come to feel just what exactly I actually express, hence just simply aim to practical experience the best way superb links of london friendship bracelet sale http://www.genuinelinksoflondonsale.co.uk/ is definitely yourself. Don't know where to shop for One-way links with

I enjoy Back links regarding Greater london Selling

2013-10-29 Thread dsfhgjh11
The particular strong cheap links of london bracelets uk http://www.linksoflondondiscountshop.co.uk/ strong provides eternally experimented with the best to good deal the purchasers any equilibrium regarding current and also only exclusive function several charms regarding fans on earth. Almost

pandora pendants uk Good quality Selected

2013-10-29 Thread dsfhgjh11
This specific variety usually means one of several most significant Low-priced pandora that will Pandora features readily available, along with involves a number of surely gorgeous pieces strong pandora pendants uk http://www.cheappandoracharms2013.co.uk/ strong discounted pertaining to people.

This pandora beads, superb treat

2013-10-29 Thread dsfhgjh11
Most of these completely new strong pandora watches http://www.pandoraussale.biz/ strong connected with spg 2011 usually are electrifying seeing that very well seeing that contemporary| which might be eternal representations connected with really enjoy in addition to aims. Because of their a

Re: Limiting disk usage

2013-10-29 Thread Matthieu Moy
Piotr Krukowiecki piotr.krukowie...@gmail.com writes: Hi, What can be done to limit amount of space occupied on clone and checkout? I know about shallow clone and sparse checkout, anything else? Sorry if I'm stating the obvious, but git gc is a good start. If you did something wrong with

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-29 Thread Matthieu Moy
Jeff King p...@peff.net writes: We could probably make this friendlier by reading from ~/.githooks and defining some semantics for multiple hooks. I'd be all for it, except I'd call this ~/.config/git/hooks/* (or $XDG_CONFIG_HOME if set). E.g., fall back to ~/.githooks if the repo hook is

swarovski crystal rings Apparent Solitaire Stud Pierced Bracelets

2013-10-29 Thread dsfhgjh11
You'll will need a couple of smooth nosed diamond jewelry pliers that will put the particular clasp and also back links on the particular comes to an end with the necklace around your neck and lastly, a selection of strong swarovski crystal http://www.swarovskicrystalonlineshop.co.uk/ strong. You

git-contacts questions

2013-10-29 Thread Sebastian Schuberth
Hi, I'm currently trying to get git-contacts to work under Windows / MSYS. I have a few issues that may be due to me using the script in a wrong way, or the script having some bugs, so I'd like to ask you for help. 1) Passing just HEAD as a committish like in git contacts HEAD does not output

Re: [PATCH v3 2/2] merge-base: teach --fork-point mode

2013-10-29 Thread John Keeping
On Mon, Oct 28, 2013 at 12:13:22PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: The --reflog name has the advantage that it makes clear that this is looking at something more than the commit graph and I don't think --fork-point does imply that. I think I

RE: [PATCH v4 12/10] git-remote-testgit: support the new 'force' option

2013-10-29 Thread Felipe Contreras
Richard Hansen wrote: Signed-off-by: Richard Hansen rhan...@bbn.com --- git-remote-testgit.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh index 6d2f282..80546c1 100755 --- a/git-remote-testgit.sh +++

Re: git-contacts questions

2013-10-29 Thread Felipe Contreras
On Tue, Oct 29, 2013 at 2:34 AM, Sebastian Schuberth sschube...@gmail.com wrote: 1) Passing just HEAD as a committish like in git contacts HEAD does not output anything for me, but using the SHA1 for HEAD does neither. My HEAD commit does not add any files, but only modifies previously

Re: What's cooking in git.git (Oct 2013, #06; Fri, 25)

2013-10-29 Thread Karsten Blees
On Mon, Oct 28, 2013 at 10:04 PM, Vicent Martí tan...@gmail.com wrote: On Mon, Oct 28, 2013 at 8:45 PM, Karsten Blees karsten.bl...@gmail.com wrote: Regarding performance, khash uses open addressing, which requires more key comparisons (O(1/(1-load_factor))) than chaining

Re: git-contacts questions

2013-10-29 Thread Sebastian Schuberth
On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: 1) Passing just HEAD as a committish like in git contacts HEAD does not output anything for me, but using the SHA1 for HEAD does neither. My HEAD commit does not add any files, but only modifies previously

Re: git-contacts questions

2013-10-29 Thread Felipe Contreras
On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: 1) Passing just HEAD as a committish like in git contacts HEAD does not output anything for me, but using the SHA1 for HEAD does

[PATCH] Add option --no-tags

2013-10-29 Thread Nicolas Cornu
From 1cbc2c49454581a67cce09ada1386dac4ffa2828 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu nco...@aldebaran-robotics.com Date: Tue, 29 Oct 2013 11:31:10 +0100 Subject: [PATCH] Add option --no-tags --- gitk-git/gitk | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git

How to retrieve the rewritten list like the one made by git-rebase

2013-10-29 Thread Francis Moreau
Hello, I'd like to get a similar rewritten list than the one that git-rebase pass to the post-rewrite hook. Is there any ways to do that without using the post-rewrite hook ? Thanks -- Francis -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: Limiting disk usage

2013-10-29 Thread Piotr Krukowiecki
[resending as sent previous version as HTML, sorry about that] On Tue, Oct 29, 2013 at 9:21 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Piotr Krukowiecki piotr.krukowie...@gmail.com writes: Hi, What can be done to limit amount of space occupied on clone and checkout? I know

[PATCH] Add a scrollbar for commit history in gitk

2013-10-29 Thread Nicolas Cornu
From b3570290bd761a1bf952ea491fa62b123231fe61 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu nco...@aldebaran-robotics.com Date: Tue, 29 Oct 2013 14:51:29 +0100 Subject: [PATCH] Add a scrollbar for commit history in gitk --- gitk-git/gitk | 8 +++- 1 file changed, 7 insertions(+), 1

Why is git-subtree docs XML and not HTML?

2013-10-29 Thread Sebastian Schuberth
Hi, I'm currently looking at subtree's Makefile and wondering why the generated markup docs is git-subtree.xml, and not git-subtree.html like for the rest of the git commands. I have not looked at git-subtree.xml because I'm lacking asciidoc right now, but is it just a matter of changing the file

Re: git-contacts questions

2013-10-29 Thread Sebastian Schuberth
On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: 1) Passing just HEAD as a committish like

Re: git svn already set … wanted to set to:

2013-10-29 Thread DimanNe
What does your config look like now? [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [svn-remote svn] url = https://some_host/trunk/ fetch = :refs/remotes/git-svn [merge] renameLimit = 5

Re: git-contacts questions

2013-10-29 Thread Matthieu Moy
Sebastian Schuberth sschube...@gmail.com writes: On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras felipe.contre...@gmail.com

Re: Limiting disk usage

2013-10-29 Thread Jakub Narębski
On 2013-10-29 14:50, Piotr Krukowiecki wrote: Yes, I put a lot of code into the repository. I know it is wrong from git POV ;) That's why I wrote about splitting repository into multiple smaller repositories, but AFAIK git is not very good at managing that too... Lot of code isn't problem,

eccellenza del lusso russia emirati arabi

2013-10-29 Thread fashionvipmagaz_2013
http://www.fashionvipmagazine.com http://www.fashionvipmagazine.com -- If you do not want to receive any more newsletters, http://dem.fashionvipmagazine.com/lists/?p=unsubscribeuid=28f5b000728b6a9507611f37112d001e To update your preferences and to unsubscribe visit

Re: git-contacts questions

2013-10-29 Thread Sebastian Schuberth
On Tue, Oct 29, 2013 at 3:39 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: I'm not sure what you're trying to point me at. It's clear that from an implementation view you need to blame HEAD^ if you need to know which poeple should review your changes in HEAD. I agree that the

Re: Why is git-subtree docs XML and not HTML?

2013-10-29 Thread Jeff King
On Tue, Oct 29, 2013 at 03:03:40PM +0100, Sebastian Schuberth wrote: I'm currently looking at subtree's Makefile and wondering why the generated markup docs is git-subtree.xml, and not git-subtree.html like for the rest of the git commands. I have not looked at git-subtree.xml because I'm

Re: Why is git-subtree docs XML and not HTML?

2013-10-29 Thread Sebastian Schuberth
On Tue, Oct 29, 2013 at 4:50 PM, Jeff King p...@peff.net wrote: I think this would do what you want: diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 435b2de..e9026da 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -21,6 +21,7 @@ GIT_SUBTREE

[PATCH] subtree: add makefile target for html docs

2013-10-29 Thread Jeff King
On Tue, Oct 29, 2013 at 05:03:53PM +0100, Sebastian Schuberth wrote: I just gave it a try and it works nicely: Tested-by: Sebastian Schuberth sschube...@gmail.com Also, the clean target already contains *.html, so nothing else to do there. Any chance to get this queued in pu? Here it is

rcs

2013-10-29 Thread Finnerty, James M Mr CTR USA USASOC-SOAR
Hi. I'm going to attempt to import a git database into Razor which is linux rcs based. Does the linux version of git use rcs ? Thanks Jim Jim Finnerty ECS, Inc. Comm: (270) 798-1386, Fax: (270)798-7724 Cell: (570) 498-8499 CAUTION: This message may contain competitive, sensitive or other

Re: git-contacts questions

2013-10-29 Thread Felipe Contreras
On Tue, Oct 29, 2013 at 8:17 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth sschube...@gmail.com wrote: $ git related

Re: rcs

2013-10-29 Thread Keshav Kini
Finnerty, James M Mr CTR USA USASOC-SOAR jim.finnerty@soar.army.mil writes: Hi. I'm going to attempt to import a git database into Razor which is linux rcs based. Does the linux version of git use rcs ? If you're talking about the GNU rcs program, no, it does not. -Keshav -- To

Re: rcs

2013-10-29 Thread Jeff King
On Tue, Oct 29, 2013 at 11:35:21AM -0500, Finnerty, James M Mr CTR USA USASOC-SOAR wrote: Hi. I'm going to attempt to import a git database into Razor which is linux rcs based. Does the linux version of git use rcs ? No, the formats are completely different, and you will have to translate.

Re: git-contacts questions

2013-10-29 Thread Eric Sunshine
On Tue, Oct 29, 2013 at 4:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Oct 29, 2013 at 2:34 AM, Sebastian Schuberth sschube...@gmail.com wrote: 2) For some commits I get error messages from git blame in function get_blame because multiple -L options are specified: $ git

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

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

2013-10-29 Thread Fredrik Gustafsson
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/*

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,

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

2013-10-29 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: On Mon, Oct 28, 2013 at 10:08 AM, Junio C Hamano gits...@pobox.com wrote: Thinking aloud further, what I had in mind was along the lines of the following. * The most generic external interface would be spelled as --trailer

Re: [PATCH v3 2/2] merge-base: teach --fork-point mode

2013-10-29 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: OK - given this reasoning I agree that --fork-point makes sense. I think this would have been clearer if the short description said something like: Find the point at which a branch forked from another branch; this does not just look for the

Re: git-contacts questions

2013-10-29 Thread Sebastian Schuberth
On Tue, Oct 29, 2013 at 8:02 PM, Eric Sunshine sunsh...@sunshineco.com wrote: $ git contacts b0783baacd20be7007df40cf274985c4863d63fb fatal: More than one '-L n,m' option given fatal: More than one '-L n,m' option given fatal: More than one '-L n,m' option given fatal: More than one '-L n,m'

[PATCH V3] git clone: is an URL local or ssh

2013-10-29 Thread Torsten Bögershausen
Commit 8d3d28f5 added test cases for URLs which should be ssh. Add more tests testing all the combinations: -IPv4 or IPv6 -path starting with / or with /~ -with and without the ssh:// scheme Add tests for ssh:// with port number. When a git repository foo:bar exist, git clone will call

Re: collapsing old git history to reduce repo size, while preserving commit #s and tags

2013-10-29 Thread Stas Cherkassky
Hi, I have an old git repo with e.g. 1000 commits, that grew up to considerable size. Now, I am starting a new project and want to use this repo, but slimmed down. I'd like to clone the repo to the new project and slim it down I'd like to collapse 900 first commits into one, but keep last 100,

Re: collapsing old git history to reduce repo size, while preserving commit #s and tags

2013-10-29 Thread Andrew Ardill
On 29 October 2013 15:42, Stas Cherkassky scher...@gmail.com wrote: I'd like to clone the repo to the new project and slim it down I'd like to collapse 900 first commits into one, but keep last 100, with their commit numbers and tags. I also want to be able to push and merge changes from the

Re: [PATCH v2 1/7] gitk: support -G option from the command line

2013-10-29 Thread Junio C Hamano
Thomas Rast t...@thomasrast.ch writes: From: Thomas Rast tr...@inf.ethz.ch The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- gitk-git/gitk | 2 +- You CC'ed Paul, which is absolutely the right thing to do,

Re: [PATCH v2 6/7] Documentation: put blame/log -L in sticked form

2013-10-29 Thread Junio C Hamano
Thomas Rast t...@thomasrast.ch writes: The next patch will document gitk -L, but gitk does not understand the separated form ('gitk -L :foo:bar' results in an error). Spell git-blame and git-log -L, which are supposed to be the same option, without the spaces to prevent confusion. I agree

Re: Git v1.8.4.2 test failure in ./t5570-git-daemon.sh

2013-10-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Oct 29, 2013 at 01:54:31AM +0100, Simon Ruderich wrote: I just compiled Git v1.8.4.2 on Debian Wheezy amd64 and test t5570 fails (with GIT_TEST_GIT_DAEMON=1): [...] Bisecting leads to this commit: commit 68b939b2f097b6675c4aaa17869aa81b25cb

Re: [PATCH 10/15] fetch --tags: fetch tags *in addition to* other stuff

2013-10-29 Thread Michael Haggerty
On 10/28/2013 08:10 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: True but when fetching other references, tags relevant to the history being fetched by default should automatically follow, so the above explains why fetch --tags is not a useful thing to do daily.

[PATCH v2 00/23] Change semantics of fetch --tags

2013-10-29 Thread Michael Haggerty
This is v2 of my proposed fix for the local tag killer problem that I reported recently [1]. Thanks a lot to Junio for his feedback on v1. Changes since v1: * Rebase to current upstream master (0d6cf2471f); no conflicts were encountered. * Incorporate feedback from Junio: * Improve the

[PATCH v2 04/23] api-remote.txt: correct section struct refspec

2013-10-29 Thread Michael Haggerty
* Replace reference to function parse_ref_spec() with references to functions parse_fetch_refspec() and parse_push_refspec(). * Correct description of src and dst: they *do* include the '*' characters. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu ---

[PATCH v2 15/23] fetch, remote: properly convey --no-prune options to subprocesses

2013-10-29 Thread Michael Haggerty
If --no-prune is passed to one of the following commands: git fetch --all git fetch --multiple git fetch --recurse-submodules git remote update then it must also be passed to the fetch subprocesses that those commands use to do their work. Otherwise there might be a fetch.prune

[PATCH v2 07/23] get_expanded_map(): add docstring

2013-10-29 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- remote.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/remote.c b/remote.c index 9f1a8aa..0d082cd 100644 --- a/remote.c +++ b/remote.c @@ -1553,6 +1553,13 @@ static int ignore_symref_update(const char *refname) return

[PATCH v2 08/23] get_expanded_map(): avoid memory leak

2013-10-29 Thread Michael Haggerty
The old code could leak *expn_name if match_name_with_pattern() succeeded but ignore_symref_update() returned true. So make sure that *expn_name is freed in any case. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH v2 01/23] t5510: use the correct tag name in test

2013-10-29 Thread Michael Haggerty
Fix an apparent copy-paste error: A few lines earlier, a tag refs/tags/sometag is created. Check for the (non-)existence of that tag, not somebranch, which is otherwise never mentioned in the script. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- t/t5510-fetch.sh | 2 +- 1 file

[PATCH v2 05/23] get_ref_map(): rename local variables

2013-10-29 Thread Michael Haggerty
Rename refs - refspecs and ref_count - refspec_count to reduce confusion, because they describe an array of struct refspec, as opposed to the struct ref objects that are also used in this function. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- builtin/fetch.c | 12 ++-- 1 file

[PATCH v2 10/23] fetch --tags: fetch tags *in addition to* other stuff

2013-10-29 Thread Michael Haggerty
Previously, fetch's --tags option was considered equivalent to specifying the refspec refs/tags/*:refs/tags/* on the command line; in particular, it caused the remote.name.refspec configuration to be ignored. But it is not very useful to fetch tags without also fetching other references, whereas

[PATCH v2 02/23] t5510: prepare test refs more straightforwardly

2013-10-29 Thread Michael Haggerty
git fetch was being used with contrived refspecs to create tags and remote-tracking branches in test repositories in preparation for the actual tests. This is obscure and also makes one wonder whether this is indeed just preparation or whether some side-effect of git fetch is being tested. So

[PATCH v2 03/23] t5510: check that git fetch --prune --tags does not prune branches

2013-10-29 Thread Michael Haggerty
git fetch --prune --tags is currently interpreted as follows: * --tags is equivalent to specifying a refspec refs/tags/*:refs/tags/*, and supersedes any default refspecs configured via remote.$REMOTE.fetch. * --prune only operates on the refspecs being fetched. Therefore, git fetch --prune

[PATCH v2 06/23] builtin/fetch.c: reorder function definitions

2013-10-29 Thread Michael Haggerty
Reorder function definitions to avoid the need for a forward declaration of function find_non_local_tags(). Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- builtin/fetch.c | 198 +++- 1 file changed, 97 insertions(+), 101 deletions(-)

[PATCH v2 18/23] ref_remove_duplicates(): avoid redundant bisection

2013-10-29 Thread Michael Haggerty
The old code called string_list_lookup(), and if that failed called string_list_insert(), thus doing the bisection search through the string list twice in the latter code path. Instead, just call string_list_insert() right away. If an entry for that peer reference name already existed, then its

[PATCH v2 17/23] git-fetch.txt: improve description of tag auto-following

2013-10-29 Thread Michael Haggerty
Make it clearer that tags are fetched independent of which branches were fetched from the remote in any particular fetch. (Tags are even fetched if they point at objects that are in the current repository but not reachable, which is probably a bug.) Put less emphasis on the mechanism and more on

[PATCH v2 12/23] query_refspecs(): move some constants out of the loop

2013-10-29 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- remote.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote.c b/remote.c index e42daa8..a5e6c7f 100644 --- a/remote.c +++ b/remote.c @@ -825,6 +825,8 @@ static int query_refspecs(struct refspec *refs, int

[PATCH v2 16/23] fetch-options.txt: simplify ifdef/ifndef/endif usage

2013-10-29 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- Documentation/fetch-options.txt | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 12b1d92..f0ef7d0 100644 --- a/Documentation/fetch-options.txt

[PATCH v2 14/23] builtin/remote.c:update(): use struct argv_array

2013-10-29 Thread Michael Haggerty
Use struct argv_array for calling the git fetch subprocesses. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- builtin/remote.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index

[PATCH v2 23/23] fetch: improve the error messages emitted for conflicting refspecs

2013-10-29 Thread Michael Haggerty
If we find two refspecs that want to update the same local reference, emit an error message that is more informative based on whether one of the conflicting refspecs is an opportunistic update during a fetch with explicit command-line refspecs. And especially, do not die if an opportunistic

[PATCH v2 22/23] handle_duplicate(): mark error message for translation

2013-10-29 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote.c b/remote.c index 2deb2db..06a0eda 100644 --- a/remote.c +++ b/remote.c @@ -748,7 +748,7 @@ int for_each_remote(each_remote_fn fn, void *priv) static void

[PATCH v2 09/23] fetch: only opportunistically update references based on command line

2013-10-29 Thread Michael Haggerty
The old code processed (tags == TAGS_SET) before adding the entries used to opportunistically update references mentioned on the command line. The result was that all tags were also considered candidates for opportunistic updating. This is harmless for two reasons: (a) because it would only add

[PATCH v2 20/23] ref_remove_duplicates(): simplify loop logic

2013-10-29 Thread Michael Haggerty
Change the loop body into the more straightforward * remove item from the front of the old list * if necessary, add it to the tail of the new list and return a pointer to the new list (even though it is currently always the same as the input argument, because the first element in the list is

[PATCH v2 11/23] fetch --prune: prune only based on explicit refspecs

2013-10-29 Thread Michael Haggerty
The old behavior of fetch --prune was to prune whatever was being fetched. In particular, fetch --prune --tags caused tags not only to be fetched, but also to be pruned. This is inappropriate because there is only one tags namespace that is shared among the local repository and all remotes.

[PATCH v2 21/23] ref_remote_duplicates(): extract a function handle_duplicate()

2013-10-29 Thread Michael Haggerty
It will become more complex in a moment. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- remote.c | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/remote.c b/remote.c index c90a2bf..2deb2db 100644 --- a/remote.c +++ b/remote.c @@ -745,6 +745,15 @@

[PATCH v2 13/23] builtin/remote.c: reorder function definitions

2013-10-29 Thread Michael Haggerty
Reorder function definitions to remove the need for forward declarations. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- builtin/remote.c | 159 +++ 1 file changed, 78 insertions(+), 81 deletions(-) diff --git a/builtin/remote.c

[PATCH v2 19/23] t5536: new test of refspec conflicts when fetching

2013-10-29 Thread Michael Haggerty
Add some tests that git fetch handles refspec conflicts (i.e., when the same local reference should be updated from two different remote references) correctly. There is a small bug when updating references opportunistically, namely that an explicit user wish like git fetch origin \

git rm bug?

2013-10-29 Thread Eunsuk Kang
Hello, My understanding was that running git rm on a file will delete all ancestors of the file that are empty directories from the file system. I've ran into a case that seems a little strange. To reproduce (using version 1.8.4.1 on Mac OS X 10.7.5): git init mkdir a mkdir b touch a/b/c.txt