git svn already set … wanted to set to:

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: svn-remote.stable

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

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 --- Documentation/gitk.txt | 12 1 file changed, 12 insertions(+) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index d44e14c..0f1c7f8 100644 ---

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

From: Thomas Rast 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 /^diff/ and is precede

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

From: Thomas Rast 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 --- gitk-git/gitk | 408

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

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 --- Documentation/blame

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

From: Thomas Rast The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: Thomas Rast --- gitk-git/gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index 5cd00d8..0e95814 100755 --- a/gitk-git/gitk

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

From: Thomas Rast 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 actually format it

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

From: Thomas Rast 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 gitk from thinki

[PATCH v2 0/7] gitk -L

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

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

DimanNe 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 this e

links of london sweetie bracelet sale Available for sale

The unique flexible links of london necklaces sale 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. Givi

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

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 is definitely yourself. Don't know where to shop for One-way links with L

I enjoy Back links regarding Greater london Selling

The particular cheap links of london bracelets uk 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 all plant h

pandora pendants uk Good quality Selected

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 pandora pendants uk discounted pertaining to people. Pandora drop

This pandora beads, superb treat

Most of these completely new pandora watches 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 long time conn

Re: Limiting disk usage

Piotr Krukowiecki 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 your repo before, mayb

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

Jeff King 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 not > execut

swarovski crystal rings Apparent Solitaire Stud Pierced Bracelets

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 swarovski crystal . You can even h

git-contacts questions

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

On Mon, Oct 28, 2013 at 12:13:22PM -0700, Junio C Hamano wrote: > John Keeping 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 understand what

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

Richard Hansen wrote: > Signed-off-by: Richard Hansen > --- > 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 > +++ b/git-remote-testgit.

Re: git-contacts questions

On Tue, Oct 29, 2013 at 2:34 AM, Sebastian Schuberth 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 existing files, so

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

On Mon, Oct 28, 2013 at 10:04 PM, Vicent Martí wrote: > > On Mon, Oct 28, 2013 at 8:45 PM, Karsten Blees > wrote: > > > Regarding performance, khash uses open addressing, which requires more key > > comparisons (O(1/(1-load_factor))) than chaining (O(1+load_factor)). > > However, any measurabl

Re: git-contacts questions

On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras 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 existing files, so

Re: git-contacts questions

On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth wrote: > On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras > 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

[PATCH] Add option --no-tags

>From 1cbc2c49454581a67cce09ada1386dac4ffa2828 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu 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 a/gitk-git/gitk b/gitk-git/gi

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

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 majord..

Re: Limiting disk usage

[resending as sent previous version as HTML, sorry about that] On Tue, Oct 29, 2013 at 9:21 AM, Matthieu Moy wrote: > > Piotr Krukowiecki writes: > > > Hi, > > > > What can be done to limit amount of space occupied on clone and > > checkout? I know about shallow clone and sparse checkout, anythi

[PATCH] Add a scrollbar for commit history in gitk

>From b3570290bd761a1bf952ea491fa62b123231fe61 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu 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 deletion(-) diff --git a/gitk-git/gitk

Why is git-subtree docs XML and not HTML?

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

On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras wrote: > On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth > wrote: >> On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras >> wrote: >> 1) Passing just "HEAD" as a committish like in "git contacts HEAD" does not output anything for me

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

> 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 [svn

Re: git-contacts questions

Sebastian Schuberth writes: > On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras > wrote: >> On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth >> wrote: >>> On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras >>> wrote: >>> > 1) Passing just "HEAD" as a committish like in "git contacts HE

Re: Limiting disk usage

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, see

eccellenza del lusso russia emirati arabi

-- If you do not want to receive any more newsletters, http://dem.fashionvipmagazine.com/lists/?p=unsubscribe&uid=28f5b000728b6a9507611f37112d001e To update your preferences and to unsubscribe visit http://dem.fashion

Re: git-contacts questions

On Tue, Oct 29, 2013 at 3:39 PM, Matthieu Moy 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 situation when providing only

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

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?

On Tue, Oct 29, 2013 at 4:50 PM, Jeff King 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:= git

[PATCH] subtree: add makefile target for html docs

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 > > Also, the clean target already contains "*.html", so nothing else to > do there. Any chance to get this queued in pu? Here it is with a commit

rcs

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 non-

Re: git-contacts questions

On Tue, Oct 29, 2013 at 8:17 AM, Sebastian Schuberth wrote: > On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras > wrote: >> On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth >> wrote: >>> $ git related b0783baacd20be7007df40cf274985c4863d63fb >>> C:/Program Files (x86)/Git/libexec/git-core/

Re: rcs

"Finnerty, James M Mr CTR USA USASOC-SOAR" 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 unsubscribe from this list: send the

Re: rcs

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

On Tue, Oct 29, 2013 at 4:57 AM, Felipe Contreras wrote: > On Tue, Oct 29, 2013 at 2:34 AM, Sebastian Schuberth > wrote: >> 2) For some commits I get error messages from "git blame" in function >> get_blame because multiple -L options are specified: >> >> $ git contacts b0783baacd20be7007df40cf27

RE: rcs

Jeff, Thanks. We have several systems using Razor right now. So we are trying to get all the systems into one CM system. Razor is just a gui that uses rcs commands. Once we get everything synced we will explore our options for a complete development CM system. Jim -Original Message---

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

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

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/* >

Re: [PATCH 1/3] use @@PERL@@ in built scripts

Jeff King writes: > Several of the built shell commands invoke a bare "perl" to > perform some one-liners. This will use the first perl in the > PATH rather than the one specified by the user's SHELL_PATH. > We are not asking these perl invocations to do anything > exotic, so typically any old sy

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

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: T

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

Christian Couder writes: > On Mon, Oct 28, 2013 at 10:08 AM, Junio C Hamano 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 [=] >> >>where can be things like

Migrate svn non-standard layout to git

I have the following SVN setup: Repository: http://svn-server:81/svn/DevJava Trunk: trunk/etl_app Branches: branches/etl_app Tags: tags/etl_app After reading the manual and git-svn man page I tried the following command in ~/src git svn clone -T trunk/etl_app -b branches/etl

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

John Keeping 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 common ancest

Re: git-contacts questions

On Tue, Oct 29, 2013 at 8:02 PM, Eric Sunshine 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' option g

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

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

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

On 29 October 2013 15:42, Stas Cherkassky 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 old repo to th

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

Thomas Rast writes: > From: Thomas Rast > > The -G option's usage is exactly analogous to that of -S, so > supporting it is easy. > > Signed-off-by: Thomas Rast > --- > gitk-git/gitk | 2 +- You CC'ed Paul, which is absolutely the right thing to do, but please make patches against his tree, wh

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

Thomas Rast 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 that this patc

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

Jeff King 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

On 10/28/2013 08:10 PM, Junio C Hamano wrote: > Michael Haggerty 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. >> >> Mayb

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

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 d

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

* 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 --- Documentation/technical/api-remote.txt | 20 +

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

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

Signed-off-by: Michael Haggerty --- 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 (flag & REF_ISSYMREF);

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

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 --- remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remote.c

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

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 --- t/t5510-fetch.sh | 2 +- 1 file changed, 1 insertion(+)

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

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 --- builtin/fetch.c | 12 ++-- 1 file change

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

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..refspec configuration to be ignored. But it is not very useful to fetch tags without also fetching other references, whereas i

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

"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

"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

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

Reorder function definitions to avoid the need for a forward declaration of function find_non_local_tags(). Signed-off-by: Michael Haggerty --- builtin/fetch.c | 198 +++- 1 file changed, 97 insertions(+), 101 deletions(-) diff --git a/builtin

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

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 u

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

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

Signed-off-by: Michael Haggerty --- 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 ref_count, struct refspec *

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

Signed-off-by: Michael Haggerty --- 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 +++ b/Documentation/fet

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

Use struct argv_array for calling the "git fetch" subprocesses. Signed-off-by: Michael Haggerty --- builtin/remote.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index ecedd96..bffe2f9 100644 --- a/bui

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

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 refere

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

Signed-off-by: Michael Haggerty --- 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 handle_duplicate(str

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

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 e

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

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 curr

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

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()

It will become more complex in a moment. Signed-off-by: Michael Haggerty --- 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 @@ int for_each_remote(e

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

Reorder function definitions to remove the need for forward declarations. Signed-off-by: Michael Haggerty --- builtin/remote.c | 159 +++ 1 file changed, 78 insertions(+), 81 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index

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

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?

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

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

Junio C Hamano writes: > Thomas Rast 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 co

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

Junio C Hamano writes: > Thomas Rast writes: > >> From: Thomas Rast >> >> The -G option's usage is exactly analogous to that of -S, so >> supporting it is easy. >> >> Signed-off-by: Thomas Rast >> --- >> gitk-git/gitk | 2 +- > > You CC'ed Paul, which is absolutely the right thing to do, but >

Re: [PATCH] Add a scrollbar for commit history in gitk

Hi Nicolas, Thanks for your patch. You should Cc Paul Mackerras on gitk patches. Nicolas Cornu writes: > From b3570290bd761a1bf952ea491fa62b123231fe61 Mon Sep 17 00:00:00 2001 > From: Nicolas Cornu > Date: Tue, 29 Oct 2013 14:51:29 +0100 > Subject: [PATCH] Add a scrollbar for commit history

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

On Tue, Oct 29, 2013 at 10:07:50PM +0100, Torsten Bögershausen wrote: > Changes since V2: > clear_ssh and expect_ssh did come back > And I couldn't get it working without the > >"$TRASH_DIRECTORY/ssh-output" Thanks. > test_when_finished: > I could not get that to work. Probably because of

Re: [PATCH] for-each-ref: avoid loading objects to print %(objectname)

On Sat, Oct 26, 2013 at 10:35:17AM +0200, Thomas Rast wrote: > Jeff King writes: > > > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh > > index 752f5cb..2b4b9a9 100755 > [...] > > +test_atom head *objectname '' > > +test_atom head *objecttype '' > [...] > > +test_atom tag *object

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

Just a heads-up: This patch breaks t5601 totally on Windows. Test #4, a local clone via file: protocol, fails already. I'm investigating now. -- Hannes -- 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 ht

Re: [PATCH 20/19] count-objects: consider .bitmap without .pack/.idx pair garbage

On Sat, Oct 26, 2013 at 05:19:56PM +0700, Nguyen Thai Ngoc Duy wrote: > Maybe squash this in some place, or leave it separate. I'm fine either way. Thanks, this makes sense. I've left it as a separate commit. Your subject did not quite make sense to me, as the effect is to _not_ report .bitmap