pandora charms on sale is frequently associated with magic

There will probably be a tremendous degree of a combination in regards to pandora jewelry charms this can help you a Pandora make achieve success, although the specific Pandora jewellery is likewise pretty eye-catching plus sophisticated. Pandora jeweller

Re: [PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

John Koleszar writes: > Filter the list of refs returned via the dumb HTTP protocol according > to the active namespace, consistent with other clients of the > upload-pack service. > > Signed-off-by: John Koleszar > --- Looks sane from a cursory read---thanks. Josh, any comments? > http-back

Re: [PATCH] git help config: s/insn/instruction/

Matthias Krüger writes: > "insn" appears to be an in-code abbreviation and should not appear in > manual/help pages. > --- Thanks; sign-off? -- 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://vge

[PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

Filter the list of refs returned via the dumb HTTP protocol according to the active namespace, consistent with other clients of the upload-pack service. Signed-off-by: John Koleszar --- http-backend.c | 8 +--- t/lib-httpd/apache.conf | 5 + t/t5561-http-backend.sh | 4

git subtree oddity

I'd like to have the following configuration: /myproject.git |__/upstream_dependency -- Points to a remote library git repo |__/project_source -- local project source I issue the following commands to pull in the upstream dependency as a subtree of the myproject.git repo: git remote add upstrea

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 11:39 PM, Jim Kinsman wrote: > git status takes 30 seconds on Windows 7. Here are some stats: > git ls-files | wc -l > 27330 > > git ls-files -o | wc -l > 4 > > $ git diff --name-only | xargs du -chs > 68K update_import_contacts.php > 68K total > > What can I do???

Re: [PATCH 9/9] clone: run check_everything_connected

On Tue, Mar 26, 2013 at 3:26 AM, Jeff King wrote: > The slowdown is really quite terrible if you try "git clone --bare > linux-2.6.git". Even with this, the local-clone case already misses blob > corruption. So it probably makes sense to restrict it to just the > non-local clone case, which alread

Re: [PATCH] push: Alias pushurl from push rewrites

Hi, Rob Hoelz wrote: > git push currently doesn't consider pushInsteadOf when > using pushurl; this test tests that. I'd leave out this paragraph, since it is redundant next to the rest of the commit message (except that you have added tests, which ideally every bugfix patch would do :)). [...]

[PATCH] git help config: s/insn/instruction/

"insn" appears to be an in-code abbreviation and should not appear in manual/help pages. --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index c1f435f..f79184c 100644 --- a/Documentation/config.tx

Re: [PATCH] push: Alias pushurl from push rewrites

Josh Triplett wrote: > I have a .gitconfig in my git-managed home > directory which sets pushInsteadOf so that I can clone via git:// and > immediately have working push. I work with a number of systems that > don't have inbound access to each other but do have outbound acce

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, Mar 27, 2013 at 04:09:43PM -0700, Josh Triplett wrote: > On Wed, Mar 27, 2013 at 05:48:45PM -0500, Rob Hoelz wrote: > > On Wed, 27 Mar 2013 15:07:18 -0700 > > Junio C Hamano wrote: > > > > > Jonathan Nieder writes: > > > > > > > Sorry, typo. The configuration in the example above shoul

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, Mar 27, 2013 at 05:48:45PM -0500, Rob Hoelz wrote: > On Wed, 27 Mar 2013 15:07:18 -0700 > Junio C Hamano wrote: > > > Jonathan Nieder writes: > > > > > Sorry, typo. The configuration in the example above should have > > > been > > > > > > [url "git://anongit.myserver.example.com/"] >

Re: [PATCH] push: Alias pushurl from push rewrites

>> Subject: Re: [PATCH] push: Alias pushurl from push rewrites Please increment [PATCH v$n] for a new round, so that we can tell which one is the latest. Rob Hoelz writes: > git push currently doesn't consider pushInsteadOf when > using pushurl; this test tests that. This patch is no longer "t

Re: [PATCH] use refnames instead of "left"/"right" in dirdiffs

On Wed, Mar 27, 2013 at 11:13:17PM +0100, Christoph Anton Mitterer wrote: > Currently, when a dir-diff is made with git-difftool the two revisions are > stored in two temporary directories ".../left" and ".../right". > Many difftools show these pathnames in ther UI and therefore it would be > help

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, 27 Mar 2013 15:56:56 -0700 Jonathan Nieder wrote: > Rob Hoelz wrote: > > > My mistake; I had not seen it! I thought you may have found a bug > > in my implementation, so I wanted to double check. =) > > Well, I had found an unfortunate consequence of the implementation > that uses an u

Re: Composing git repositories

Am 27.03.2013 18:02, schrieb Ramkumar Ramachandra: > Junio C Hamano wrote: >> Ramkumar Ramachandra writes: >>> Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in

Re: [PATCH] merge-tree: fix "same file added in subdir"

On Wed, Mar 27, 2013 at 03:42:40PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > When the same file is added with identical content at the top level, > > git-merge-tree prints "added in both" with the details. But if the file > > is added in an existing subdirectory, threeway_callbac

Re: [PATCH] push: Alias pushurl from push rewrites

Rob Hoelz wrote: > My mistake; I had not seen it! I thought you may have found a bug in > my implementation, so I wanted to double check. =) Well, I had found an unfortunate consequence of the implementation that uses an unnecessary copy. :) Will follow up to the updated patch. -- To unsubscrib

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, 27 Mar 2013 15:47:35 -0700 Jonathan Nieder wrote: > Hi, > > Rob Hoelz wrote: > > On Wed, 27 Mar 2013 11:23:45 -0700 > > Jonathan Nieder wrote: > > >> Suppose I configure > >> > >>[url "git://anongit.myserver.example.com/"] > >>insteadOf = myserver.example.com: > >>[

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

On Wed, Mar 27, 2013 at 03:15:44PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: > >> > * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits > >> > (merged to 'next' on 2013-03-19 at e68014a) > >> > + difftool --dir-

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, 27 Mar 2013 15:07:18 -0700 Junio C Hamano wrote: > Jonathan Nieder writes: > > > Sorry, typo. The configuration in the example above should have > > been > > > > [url "git://anongit.myserver.example.com/"] > > insteadOf = myserver.example.com: > > [url "myserver.exa

Re: [PATCH] push: Alias pushurl from push rewrites

Hi, Rob Hoelz wrote: > On Wed, 27 Mar 2013 11:23:45 -0700 > Jonathan Nieder wrote: >> Suppose I configure >> >> [url "git://anongit.myserver.example.com/"] >> insteadOf = myserver.example.com: >> [url "myserver:"] >> pushInsteadOf = myserver.example.com: >> >>

[PATCH] push: Alias pushurl from push rewrites

git push currently doesn't consider pushInsteadOf when using pushurl; this test tests that. If you use pushurl with an alias that has a pushInsteadOf configuration value, Git does not take advantage of it. For example: [url "git://github.com/"] insteadOf = github: [url "git://github.com/myus

Re: [PATCH] merge-tree: fix "same file added in subdir"

John Keeping writes: > When the same file is added with identical content at the top level, > git-merge-tree prints "added in both" with the details. But if the file > is added in an existing subdirectory, threeway_callback() bails out early > because the two trees have been modified identically

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, 27 Mar 2013 11:23:45 -0700 Jonathan Nieder wrote: > Rob Hoelz wrote: > > > --- a/remote.c > > +++ b/remote.c > > @@ -465,7 +465,11 @@ static void alias_all_urls(void) > > if (!remotes[i]) > > continue; > > for (j = 0; j < remotes[i]->pushurl_nr

jn/add-2.0-u-A-sans-pathspec (Re: What's cooking in git.git (Mar 2013, #07; Tue, 26))

Junio C Hamano wrote: > On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: >> * jn/add-2.0-u-A-sans-pathspec (2013-03-20) 5 commits >> - git add: -u/-A now affects the entire working tree >> - add -A: only show pathless 'add -A' warning when changes exist outside cwd >> - add -u: o

[PATCH] use refnames instead of "left"/"right" in dirdiffs

Currently, when a dir-diff is made with git-difftool the two revisions are stored in two temporary directories ".../left" and ".../right". Many difftools show these pathnames in ther UI and therefore it would be helpful for users, if actual reference names specified as progam arguments was used ins

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

John Keeping writes: > On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: >> > * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits >> > (merged to 'next' on 2013-03-19 at e68014a) >> > + difftool --dir-diff: symlink all files matching the working tree >> > + difftool: avoid do

Re: Git and GSoC 2013

On Wed, Mar 27, 2013 at 7:52 PM, Jonathan Nieder wrote: > Jeff King wrote: > >> There was a big thread about a month ago on whether Git should do Google >> Summer of Code this year[1]. I think we should do it. It looks strange to me to say that students are great and at the same time that we sho

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: > > * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits > > (merged to 'next' on 2013-03-19 at e68014a) > > + difftool --dir-diff: symlink all files matching the working tree > > + difftool: avoid double slashes in symlink targe

Re: [PATCH] push: Alias pushurl from push rewrites

Jonathan Nieder writes: > Sorry, typo. The configuration in the example above should have been > > [url "git://anongit.myserver.example.com/"] > insteadOf = myserver.example.com: > [url "myserver.example.com:"] > pushInsteadOf = myserver.example.com: > > I

which files will have conflicts between two branches?

I have two local branches (tracked to remote) that are in sync (did a git pull on both branches from their corresponding remote). Is this the best way to merge? I would be merging local/branch1 => local/branch2 (test this branch) and then push local/branch2 => origin/branch1 (and would expect

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

Thomas Rast writes: > Jeff King writes: > >> On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: >> >>> [Cooking] >>> [...] >>> * jk/index-pack-correct-depth-fix (2013-03-20) 1 commit >>> - index-pack: always zero-initialize object_entry list >>> >>> "index-pack --fix-thin" used u

[PATCH] merge-tree: fix "same file added in subdir"

When the same file is added with identical content at the top level, git-merge-tree prints "added in both" with the details. But if the file is added in an existing subdirectory, threeway_callback() bails out early because the two trees have been modified identically. In order to detect this, we

Re: [PATCH] push: Alias pushurl from push rewrites

Jonathan Nieder wrote: > Rob Hoelz wrote: >> --- a/remote.c >> +++ b/remote.c >> @@ -465,7 +465,11 @@ static void alias_all_urls(void) [...] >> -remotes[i]->pushurl[j] = >> alias_url(remotes[i]->pushurl[j], &rewrites); >> +char *copy = xstrdup(remotes[i]->p

Re: Segfault with merge-tree on multiple Git versions

On 27/03/13 20:01, Jeff King wrote: On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote: On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: Charlie Smurthwaite writes: Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server, you do

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

On Wed, Mar 27, 2013 at 01:50:29PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I was kind of surprised to see this still in pu, too. I thought it was > > supposed to cook in next for a while to shake out any interoperability > > bugs (and it was in next previously). Did it get ejected

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

Jeff King writes: > On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: > >> [Cooking] >> [...] >> * jk/index-pack-correct-depth-fix (2013-03-20) 1 commit >> - index-pack: always zero-initialize object_entry list >> >> "index-pack --fix-thin" used uninitialize value to compute delt

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

Jeff King writes: > I was kind of surprised to see this still in pu, too. I thought it was > supposed to cook in next for a while to shake out any interoperability > bugs (and it was in next previously). Did it get ejected after the > release and then never put back? Yes, I've been trying to con

Re: Composing git repositories

Junio C Hamano wrote: > I however do not see the implementation detail of having (or not > having) separate $GIT_DIR for component projects having anything to > do with the goal of that ideal. Yeah, I think the current gitlink-instead-of-full-git-dir-for-submodules implementation that can allow "

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: > [Cooking] > [...] > * jk/index-pack-correct-depth-fix (2013-03-20) 1 commit > - index-pack: always zero-initialize object_entry list > > "index-pack --fix-thin" used uninitialize value to compute delta > depths of objects it app

Re: [PATCH 5/9] add test for streaming corrupt blobs

Jeff King writes: > On Mon, Mar 25, 2013 at 04:21:34PM -0400, Jeff King wrote: > >> +# Convert byte at offset "$2" of object "$1" into '\0' >> +corrupt_byte() { >> +obj_file=$(obj_to_file "$1") && >> +chmod +w "$obj_file" && >> +printf '\0' | dd of="$obj_file" bs=1 seek="$2" >> +} > >

Re: [PATCH v3 3/3] sha1_file: remove recursion in unpack_entry

Thomas Rast writes: > Similar to the recursion in packed_object_info(), this leads to > problems on stack-space-constrained systems in the presence of long > delta chains. > > We proceed in three phases: > > 1. Dig through the delta chain, saving each delta object's offsets and >size on an ad

Re: [PATCH 5/9] add test for streaming corrupt blobs

On Mon, Mar 25, 2013 at 04:21:34PM -0400, Jeff King wrote: > +# Convert byte at offset "$2" of object "$1" into '\0' > +corrupt_byte() { > + obj_file=$(obj_to_file "$1") && > + chmod +w "$obj_file" && > + printf '\0' | dd of="$obj_file" bs=1 seek="$2" > +} Hmm, this last line should p

Re: Composing git repositories

Jonathan Nieder writes: > Ramkumar Ramachandra wrote: > >>Even then, working with one worktree embedded >> inside another is something git never designed for: it explains why I >> have to literally fight with git when using submodules > > Do you mean that you wish you coul

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 1:00 PM, Junio C Hamano wrote: > > Given that we haven't tweaked the parallelism or thread-cost > parameters since the inception of the mechanism in Nov 2008, I > suspect that we would see praises from some and grievances from > other corners of the user base for a while un

Re: Segfault with merge-tree on multiple Git versions

John Keeping writes: > You could use a temporary index and do something like: > > rm -f TMP_INDEX > GIT_INDEX_FILE=TMP_INDEX > export GIT_INDEX_FILE > git read-tree -m $base $ours $theirs && > git merge-index git-merge-one-file -a > > then inspect that with "git diff

Re: propagating repo corruption across clone

On Wed, Mar 27, 2013 at 03:49:38PM -0400, Jeff King wrote: > On Wed, Mar 27, 2013 at 11:23:15AM -0700, Rich Fromm wrote: > > > But I'm still somewhat confused about what is and is not checked under what > > conditions. Consider the three statements: > > > > # 1 > > git clone --mirror myuser@myh

[PATCH v3 3/3] sha1_file: remove recursion in unpack_entry

Similar to the recursion in packed_object_info(), this leads to problems on stack-space-constrained systems in the presence of long delta chains. We proceed in three phases: 1. Dig through the delta chain, saving each delta object's offsets and size on an ad-hoc stack. 2. Unpack the base obje

[PATCH v3 2/3] Refactor parts of in_delta_base_cache/cache_or_unpack_entry

The delta base cache lookup and test were shared. Refactor them; we'll need both parts again. Also, we'll use the clearing routine later. Signed-off-by: Thomas Rast --- sha1_file.c | 45 - 1 file changed, 32 insertions(+), 13 deletions(-) diff --git

[PATCH v3 1/3] sha1_file: remove recursion in packed_object_info

packed_object_info() and packed_delta_info() were mutually recursive. The former would handle ordinary types and defer deltas to the latter; the latter would use the former to resolve the delta base. This arrangement, however, leads to trouble with threaded index-pack and long delta chains on plat

[PATCH v3 0/3] Recursion-free unpack_entry and packed_object_info

From: Thomas Rast Almost the same as last time. Changed: the rename suggested by Junio > The only little concern I may have is this cmp_* function tells us > "I found it!" by returning true, which is counter-intuitive to the > readers of the caller (not the callee). > > I think it makes sense

Re: Segfault with merge-tree on multiple Git versions

On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote: > On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: > > Charlie Smurthwaite writes: > > > > > Yes, I would need to be able to do this on a bare repo for my use case. > > > > And if it's on the server, you don't want this to

Re: git status takes 30 seconds on Windows 7. Why?

Linus Torvalds writes: > On Wed, Mar 27, 2013 at 12:04 PM, Jeff King wrote: >> >> Yes, I think that's pretty much the case (though most of my >> Git-on-Windows experience is from cygwin long ago, where the stat >> performance was truly horrendous). Have you tried setting >> core.preloadindex, wh

Re: propagating repo corruption across clone

On Wed, Mar 27, 2013 at 11:23:15AM -0700, Rich Fromm wrote: > But I'm still somewhat confused about what is and is not checked under what > conditions. Consider the three statements: > > # 1 > git clone --mirror myuser@myhost:my_repo > > # 2 > git clone --mirror --config transfer.fsckObjects=tr

Re: Segfault with merge-tree on multiple Git versions

On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: > Charlie Smurthwaite writes: > > > Yes, I would need to be able to do this on a bare repo for my use case. > > And if it's on the server, you don't want this to be observable, so > you don't want HEAD to move around. I don't know a bet

Re: Rename conflicts in the index

Edward Thomson writes: > Junio C Hamano [mailto:gits...@pobox.com] wrote: >> We do not gratuitously break existing implementations. If no conflict is >> stored >> as higher-stage index entries in an index that has your index extension, no >> existing implementation can read a conflicted index w

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 12:04 PM, Jeff King wrote: > > Yes, I think that's pretty much the case (though most of my > Git-on-Windows experience is from cygwin long ago, where the stat > performance was truly horrendous). Have you tried setting > core.preloadindex, which should run the stats in para

Re: Composing git repositories

Ramkumar Ramachandra wrote: >Even then, working with one worktree embedded > inside another is something git never designed for: it explains why I > have to literally fight with git when using submodules Do you mean that you wish you could ignore subrepository boundaries a

Re: Segfault with merge-tree on multiple Git versions

Charlie Smurthwaite writes: > Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server, you don't want this to be observable, so you don't want HEAD to move around. I don't know a better way than: $ git clone --shared -b upstream-branch bare-repo.git

Re: propagating repo corruption across clone

Rich Fromm writes: > Apologies if my questions are considered slightly off topic -- I'm not > positive if this is supposed to be a list for developers, and not users. The list is both for users and developers. > However, I think there may be room for some additional clarity in the docs. > The

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 06:46:57PM +, John Keeping wrote: > I think the simple reality is that Git was written with the assumption > that stat is cheap and that isn't really the case on Windows, where the > filesystem cache doesn't seem to do that well with this. Yes, I think that's pretty mu

more git weirdness (git rebase, merge conflicts

I have a local/development branch tracked to origin/development. I made no changes to local/dev and did a git pull with rebase, I did not expect any conflicts. I got a conflict and was thrown onto another branch. I attempted a merge (using IntelliJ) accepting everything from the server but a

RE: Rename conflicts in the index

Junio C Hamano [mailto:gits...@pobox.com] wrote: > We do not gratuitously break existing implementations. If no conflict is > stored > as higher-stage index entries in an index that has your index extension, no > existing implementation can read a conflicted index written by your > implementation

Re: Git and GSoC 2013

Jeff King wrote: > There was a big thread about a month ago on whether Git should do Google > Summer of Code this year[1]. [...] > In my opinion, a lot of the issues come down to project selection; Let me throw in some other issues. :) * I think the git project has been very disorganized in vet

Re: propagating repo corruption across clone

Junio C Hamano wrote > If you use --local, that is equivalent to "cp -R". Your corruption > in the source will faithfully be byte-for-byte copied to the > destination. If you do not > ... > transport layer will notice > object corruption. > ... > The difference between --mirror and no --mirror is

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 01:15:43PM -0500, Jim Kinsman wrote: > The only anti-virus I have installed is Microsoft Security Essentials > I turned off and it was still the same: > $ cat /usr/bin/gitstatus > start_time=`date +%s` > git status && echo run time is $(expr `date +%s` - $start_time) s > >

Re: Segfault with merge-tree on multiple Git versions

On 27/03/13 18:06, Jed Brown wrote: Charlie Smurthwaite writes: I am also using this to obtain a diff that would be applied if a merge were to be run. Is there a better way to obtain this information that is more commonly used? You can do an actual merge using detached HEAD: $ git checkou

Git and GSoC 2013

There was a big thread about a month ago on whether Git should do Google Summer of Code this year[1]. Some people seemed in favor, and some not. The deadline for git to apply to GSoC is March 29 (this Friday) at 19:00 UTC. I am willing to act as the admin again if list consensus is that we should

Re: [PATCH] push: Alias pushurl from push rewrites

Rob Hoelz wrote: > --- a/remote.c > +++ b/remote.c > @@ -465,7 +465,11 @@ static void alias_all_urls(void) > if (!remotes[i]) > continue; > for (j = 0; j < remotes[i]->pushurl_nr; j++) { > - remotes[i]->pushurl[j] = > alias_url

Re: propagating repo corruption across clone

Jonathan Nieder-2 wrote > Is the "[transfer] fsckObjects" configuration on the host executing the > clone set to true? I hadn't been setting it at all, and according to git-config(1) it defaults to false, so the answer is no. It looks like setting it might be a good idea. But I'm still somewhat

Re: git status takes 30 seconds on Windows 7. Why?

The only anti-virus I have installed is Microsoft Security Essentials I turned off and it was still the same: $ cat /usr/bin/gitstatus start_time=`date +%s` git status && echo run time is $(expr `date +%s` - $start_time) s $ gitstatus # On branch test # Changes not staged for commit: # (use "gi

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

Junio C Hamano wrote: > Eric Wong writes: > > > > git-svn: Support custom tunnel schemes instead of SSH only (2013-03-27 > > 04:28:04 +) > > Thanks. Will pull. > > By the way, did nobody in the patch chain find the log message > problematic? It does not give any information other than

Re: Segfault with merge-tree on multiple Git versions

Charlie Smurthwaite writes: > I am also using this to obtain a diff that would be applied if a merge > were to be run. Is there a better way to obtain this information that is > more commonly used? You can do an actual merge using detached HEAD: $ git checkout --detach upstream-branch $ g

Re: [PATCH v2] Fixed typo in git-pull manual

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: Segfault with merge-tree on multiple Git versions

On 27/03/13 17:06, Junio C Hamano wrote: Charlie Smurthwaite writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d d5ef97ac407d945

Re: [PATCH] git-send-email.perl: implement suggestions made by perlcritic

Ramkumar Ramachandra writes: > I don't see this queued in 'pu'. Do you have any objections to the > patch, or did you just forget? I do not recall the details but I think I was expecting a re-roll updating the log message (if the original invited questions, there must have been some room for im

Re: Rename conflicts in the index

Edward Thomson writes: > Junio C Hamano [mailto:gits...@pobox.com] wrote: >> Edward Thomson writes: >> > I would propose that this not simply track rename conflicts, but all >> > conflicts. >> >> That is a no starter. > > So. Can you explain to me why this would be a non starter? At least two

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, Mar 27, 2013 at 11:39:31AM -0500, Jim Kinsman wrote: > git status takes 30 seconds on Windows 7. Here are some stats: > git ls-files | wc -l > 27330 > > git ls-files -o | wc -l > 4 > > $ git diff --name-only | xargs du -chs > 68K update_import_contacts.php > 68K total > > What ca

[PATCH] push: Alias pushurl from push rewrites

git push currently doesn't consider pushInsteadOf when using pushurl; this test tests that. If you use pushurl with an alias that has a pushInsteadOf configuration value, Git does not take advantage of it. For example: [url "git://github.com/"] insteadOf = github: [url "git://github.com/myus

Re: [PATCH] push: Alias pushurl from push rewrites

On Wed, 20 Mar 2013 07:35:58 -0700 Junio C Hamano wrote: > Rob Hoelz writes: > > > On 3/19/13 7:08 PM, Junio C Hamano wrote: > >> Jonathan Nieder writes: > >> > >>> Junio C Hamano wrote: > Jonathan Nieder writes: > > Test nits: > > ... > > Hope that helps, > > > > Jon

[PATCH v2] config: Consistent call style to gpg settings

From: Jacob Sarvis Calling style for passing settings to git_gpg_config is inconsistent between commit-tree, commit, log, merge, tag, and verify-tag. Consolidate style of calling git_gpg_config. Signed-off-by: Jacob Sarvis Signed-off-by: Hans Brigman --- builtin/commit-tree.c | 2 +- builtin

Re: git status takes 30 seconds on Windows 7. Why?

Jim Kinsman writes: > git status takes 30 seconds on Windows 7. Any anti-virus installed? They can interfer badly with disk-intensive tasks ... -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord.

Re: Segfault with merge-tree on multiple Git versions

On 27/03/13 17:06, Junio C Hamano wrote: Charlie Smurthwaite writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d d5ef97ac407d945

Re: Composing git repositories

Ramkumar Ramachandra writes: > Sorry, I'm deviating. I learnt why you think the hack is necessary > and not "too wrong". OK. > As I explained above, the entire design is > asymmetric and inelegant; I think we can do much better than this. I personally find the "explained above" part making no

Re: [PATCH] git-send-email.perl: implement suggestions made by perlcritic

Junio, I don't see this queued in 'pu'. Do you have any objections to the patch, or did you just forget? 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.h

Re: Segfault with merge-tree on multiple Git versions

Charlie Smurthwaite writes: > I am experiencing a segmentation fault in various versions of Git using > different repositories. > ... > Test Command > git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f > 8d6bdf012941d876b2279994e02f1bb0d5c26e7d > d5ef97ac407d945f231cd7c8fb1cfe48b3a12083 Tha

[PATCH v2] Fixed typo in git-pull manual

Signed-off-by: Mihai Capotă --- Documentation/git-pull.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c975743..24ab07a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -218,7 +218,

RE: Rename conflicts in the index

Junio C Hamano [mailto:gits...@pobox.com] wrote: > Edward Thomson writes: > > I would propose that this not simply track rename conflicts, but all > > conflicts. > > That is a no starter. So. Can you explain to me why this would be a non starter? Can you suggest some alternate strategy here?

Re: [PATCH v2] log: Read gpg settings for signed commit verification

Jeff King writes: > On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: > >> >} >> > - >> > + if (git_gpg_config(var, value, cb) < 0) >> > + return -1; >> >if (grep_config(var, value, cb) < 0) >> >return -1; >> >> Hmph. I do not particularly like the wa

Re: Composing git repositories

Junio C Hamano wrote: > Ramkumar Ramachandra writes: >> Junio C Hamano wrote: >>> So you have to stash it somewhere. We could have made it to move >>> them to $HOME/.safeplace or somewhere totally unrelated to the >>> superproject. So in that sense, the repositories are *not* owned by >>> the su

Re: git status takes 30 seconds on Windows 7. Why?

On Wed, 27 Mar 2013 11:39:31 -0500 Jim Kinsman wrote: > git status takes 30 seconds on Windows 7. Here are some stats: [...] > What can I do??? This is so slow it is unbearable. > By the way i've done git gc several times and nothing changed. You could try some voodoo [1] or experimental caching

Re: git status takes 30 seconds on Windows 7. Why?

On 03/27/2013 05:39 PM, Jim Kinsman wrote: > git status takes 30 seconds on Windows 7. Here are some stats: > git ls-files | wc -l > 27330 > > git ls-files -o | wc -l > 4 > > $ git diff --name-only | xargs du -chs > 68K update_import_contacts.php > 68K total > > What can I do??? This is

git status takes 30 seconds on Windows 7. Why?

git status takes 30 seconds on Windows 7. Here are some stats: git ls-files | wc -l 27330 git ls-files -o | wc -l 4 $ git diff --name-only | xargs du -chs 68K update_import_contacts.php 68K total What can I do??? This is so slow it is unbearable. By the way i've done git gc several times

Re: Segfault with merge-tree on multiple Git versions

John Keeping writes: > Looks like a simple typo in merge-tree.c::unresolved: Thanks. > > -- >8 -- > merge-tree: fix typo in merge-tree.c::unresolved > > When calculating whether there is a d/f conflict, the calculation of > whether both sides are directories generates an incorrect references >

Re: [PATCH] Enhance git-commit doc for multiple `-m` options

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: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

Eric Wong writes: > Sebastian Schuberth wrote: >> This originates from an msysgit pull request, see: >> >> https://github.com/msysgit/git/pull/58 >> >> Signed-off-by: Eric Wieser >> Signed-off-by: Sebastian Schuberth > > Thanks, looks obviously correct. > > Signed-off-by: Eric Wong > ... >

Re: [PATCH v2] log: Read gpg settings for signed commit verification

On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: > > } > > - > > + if (git_gpg_config(var, value, cb) < 0) > > + return -1; > > if (grep_config(var, value, cb) < 0) > > return -1; > > Hmph. I do not particularly like the way the call to grep_config(

Re: [PATCH 00/15] Use test_config

Hi, Le 27.03.2013 16:05, Junio C Hamano a écrit : Yann Droneaud writes: Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266 Is this because I suggested you to clean things up while you were touching in a vicinity of something that could use this clean-up? Yes, grep'ing shows

Re: [PATCH] config: Consistent call style to gpg settings

Hans Brigman writes: > From: Jacob Sarvis > > config: Consistent call style to gpg settings > > Calling style for passing settings to git_gpg_config is inconsistent > between commit-tree, commit, merge, tag, and verify-tag. > > Consolidate style of calling git_gpg_config. > > Signed-off-by: Hans

  1   2   >