[PATCH 3/3] remote-curl: fix large pushes with GSSAPI

2013-10-30 Thread Jeff King
From: brian m. carlson Due to an interaction between the way libcurl handles GSSAPI authentication over HTTP and the way git uses libcurl, large pushes (those over http.postBuffer bytes) would fail due to an authentication failure requiring a rewind of the curl buffer. Such a rewind was not poss

[PATCH 2/3] remote-curl: pass curl slot_results back through run_slot

2013-10-30 Thread Jeff King
Some callers may want to know more than just the integer error code we return. Let them optionally pass a slot_results struct to fill in (or NULL if they do not care). In either case we continue to return the integer code. We can also give probe_rpc the same treatment (since it builds directly on

[PATCH 1/3] http: return curl's AUTHAVAIL via slot_results

2013-10-30 Thread Jeff King
Callers of the http code may want to know which auth types were available for the previous request. But after finishing with the curl slot, they are not supposed to look at the curl handle again. We already handle returning other information via the slot_results struct; let's add a flag to check th

Re: [PATCH v4] remote-curl: fix large pushes with GSSAPI

2013-10-30 Thread Jeff King
On Wed, Oct 30, 2013 at 10:40:30PM +, brian m. carlson wrote: > If you would split it out, that would be great. Then I'll simply rebase > my patch on top of yours and go from there. I just included your patch on top, since it was the residue left over after committing my refactoring. Please

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

2013-10-30 Thread Duy Nguyen
On Thu, Oct 31, 2013 at 1:12 AM, Johan Herland wrote: > Yes, we do lack a good infrastructure for managing Git hooks from > multiple sources. It makes people afraid to use them, because they > might conflict with hooks from another source. There are (off the top > of my head): > > - "personal" ho

Re: Help creating git alias

2013-10-30 Thread Junio C Hamano
Eugene Sajine writes: > That was my initial intention, because I would like to be able to pass > parameters like to git log or git blame correctly without the explicit > use of $1. Could you please advise about how to make it work with the > !sh -c ? > > Because the same exact (sed 's/@\\S*//') s

Re: Help creating git alias

2013-10-30 Thread Eugene Sajine
On Wed, Oct 30, 2013 at 5:02 PM, Junio C Hamano wrote: > Eugene Sajine writes: > >> On Wed, Oct 30, 2013 at 3:57 PM, Ralf Thielow wrote: >>> lg=!git log --pretty=format:'%h %ad %ae %s' --date=short | sed 's/@\\S*//g' >>> >>> should work. >> >> >> It did! thanks! I didn't know that "!sh -c" is no

Re: [PATCH v4] remote-curl: fix large pushes with GSSAPI

2013-10-30 Thread brian m. carlson
On Wed, Oct 30, 2013 at 04:45:10AM -0400, Jeff King wrote: > However, we do reuse the curl handles. And in the case of rpc case, we > are only doing one request at a time, so the handle you get is > guaranteed to be the last one used. So it works in practice, but it > would break if the curl handl

What's cooking in git.git (Oct 2013, #08; Wed, 30)

2013-10-30 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. An early preview 1.8.5-rc0 has been tagged. There still are handful of fixes and enhancements left in 'next' that I'd like to see in the final,

[ANNOUNCE] Git v1.8.5-rc0

2013-10-30 Thread Junio C Hamano
An early preview Git v1.8.5-rc0 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 591a2397df1bd14ea010df6980026d64df7f9653 git-1.8.5.rc0.tar.gz be710eb67af014248ab09972e1e409a

Re: [PATCH] warn about http server document being too old

2013-10-30 Thread Junio C Hamano
Junio C Hamano writes: > Sitaram Chamarty writes: > >> - describe when it is still applicable >> - tell people where to go for most normal cases >> >> Signed-off-by: Sitaram Chamarty >> --- >> >> ref: http://thread.gmane.org/gmane.comp.version-control.git/159633. Yes >> it's very old but b

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Ramsay Jones
On 30/10/13 20:30, Torsten Bögershausen wrote: > On 2013-10-30 20.06, Ramsay Jones wrote: >> On 30/10/13 17:14, Torsten Bögershausen wrote: >>> On 2013-10-30 18.01, Vicent Martí wrote: On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: > There is a name clash under cygwin

Re: Help creating git alias

2013-10-30 Thread Junio C Hamano
Eugene Sajine writes: > On Wed, Oct 30, 2013 at 3:57 PM, Ralf Thielow wrote: >> lg=!git log --pretty=format:'%h %ad %ae %s' --date=short | sed 's/@\\S*//g' >> >> should work. > > > It did! thanks! I didn't know that "!sh -c" is not needed "sh -c" is often used when you pass arguments to your sc

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Torsten Bögershausen
On 2013-10-30 20.06, Ramsay Jones wrote: > On 30/10/13 17:14, Torsten Bögershausen wrote: >> On 2013-10-30 18.01, Vicent Martí wrote: >>> On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: There is a name clash under cygwin 1.7 (1.5 is OK) The following "first aid hot fix" work

Re: [PATCH 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Jeff King
On Wed, Oct 30, 2013 at 04:47:57PM +0100, Vicent Martí wrote: > Yes, our pack writing and bitmap code takes enough precautions to > arrange the objects in the packfile in a way that can be partially > reused, so for any given bitmap file written from Git, I'd say we're > safe to always reuse the l

Re: Help creating git alias

2013-10-30 Thread Eugene Sajine
On Wed, Oct 30, 2013 at 3:57 PM, Ralf Thielow wrote: > lg=!git log --pretty=format:'%h %ad %ae %s' --date=short | sed 's/@\\S*//g' > > should work. It did! thanks! I didn't know that "!sh -c" is not needed > > On Wed, Oct 30, 2013 at 8:34 PM, Eugene Sajine wrote: >> Hi, >> >> I need some advic

Re: [PATCH v2 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Jeff King
On Wed, Oct 30, 2013 at 05:28:08PM +0700, Nguyen Thai Ngoc Duy wrote: > > One other criterion I should have mentioned: we must be using the > > internal rev-list. That prevented us in v1.8.4.1 and earlier from using > > bitmaps for shallow fetches. But as of v1.8.4.2, we always use > > pack-object

Re: Help creating git alias

2013-10-30 Thread Ralf Thielow
lg=!git log --pretty=format:'%h %ad %ae %s' --date=short | sed 's/@\\S*//g' should work. On Wed, Oct 30, 2013 at 8:34 PM, Eugene Sajine wrote: > Hi, > > I need some advice about creating the git command alias: > > I have this as the command: > > git log --pretty=format:"%h %ad %ae %s" --date=sho

Re: Help creating git alias

2013-10-30 Thread Eugene Sajine
On Wed, Oct 30, 2013 at 3:47 PM, Andrew Ardill wrote: > Have you tried backslash escaping the backslash? double escaping? > > I don't know how many are required, but I would try first \S, then > \\S, then S, etc > Regards, > > Andrew Ardill When i do that it stops understanding \S* as regexp

Re: Help creating git alias

2013-10-30 Thread Andrew Ardill
Have you tried backslash escaping the backslash? double escaping? I don't know how many are required, but I would try first \S, then \\S, then S, etc Regards, Andrew Ardill On 30 October 2013 12:34, Eugene Sajine wrote: > Hi, > > I need some advice about creating the git command alias: > >

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

2013-10-30 Thread Junio C Hamano
Thomas Rast writes: > So my short-term plan just became: document instead of fix; clean up > manpages towards the stuck form for long options; have gitk only parse > -Lstuck. > > Medium term we can move gitk to a different option parser, resolving at > least that inconsistency. > > Longer term we

Help creating git alias

2013-10-30 Thread Eugene Sajine
Hi, I need some advice about creating the git command alias: I have this as the command: git log --pretty=format:"%h %ad %ae %s" --date=short | sed 's/@\S*//g' The purpose is to cut off the email domain and keep only username. I'm trying to create this as the alias: lg = !sh -c 'git log --p

Re: [PATCH] Change sed i\ usage to something Solaris' sed can handle

2013-10-30 Thread Junio C Hamano
Ben Walton writes: > On Mon, Oct 28, 2013 at 5:39 PM, Andreas Schwab wrote: >> Ben Walton writes: >> >>> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh >>> index 3fb4b97..0126154 100755 >>> --- a/t/t4015-diff-whitespace.sh >>> +++ b/t/t4015-diff-whitespace.sh >>> @@ -145,7

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Ramsay Jones
On 30/10/13 17:39, Torsten Bögershausen wrote: > On 2013-10-30 18.14, Torsten Bögershausen wrote: >> On 2013-10-30 18.01, Vicent Martí wrote: >>> On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: There is a name clash under cygwin 1.7 (1.5 is OK) The following "first aid hot f

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

2013-10-30 Thread Johan Herland
On Tue, Oct 29, 2013 at 7:23 AM, Christian Couder wrote: > On Mon, Oct 28, 2013 at 3:46 AM, Johan Herland wrote: >> On Sun, Oct 27, 2013 at 8:04 PM, Christian Couder >> wrote: >>> If "git commit" processes these arguments and puts the result in the >>> commit message file that is passed to the

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Ramsay Jones
On 30/10/13 17:14, Torsten Bögershausen wrote: > On 2013-10-30 18.01, Vicent Martí wrote: >> On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: >>> There is a name clash under cygwin 1.7 (1.5 is OK) >>> The following "first aid hot fix" works for me: >>> /Torsten >> >> If Cygwin declares

Re: git rm bug?

2013-10-30 Thread Junio C Hamano
Eunsuk Kang writes: > 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. Not really. We do recurse up to see if a/b/ and then a/ has become a useless empty directory when we did remove a/b/c from the wo

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

2013-10-30 Thread Thomas Rast
Junio C Hamano writes: > Thomas Rast writes: > >> Junio C Hamano writes: >> >>> I agree that this patch may reduce confusion locally, but if we were >>> to go in this direction, we should be consistent and enforce "stuck" >>> form everywhere, >> >> Hmm. Do you want to go there? > > Absolutely

git svn clone reprocessing old commits many times?

2013-10-30 Thread Jim Garrison
I'm trying to clone an svn repository to git in preparation for a migration to git, including all branches and tags. The clone is taking a long time, and it looks like every time it detects a possible branch point it backs up and reprocesses a bunch of old commits. For example: r43224 = f308b

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

2013-10-30 Thread Junio C Hamano
Tony Luck writes: > On Sat, Oct 26, 2013 at 6:34 PM, Josh Triplett wrote: > >> + format_commit_message(commit, "Fixes: %h ('%s')\n", sb, >> &ctx); > > What is the value of double wrapping the commit message inside '...' > and then ('...')? Good point ;-) -- To unsubscribe from th

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

2013-10-30 Thread Johan Herland
On Tue, Oct 29, 2013 at 3:08 AM, Jeff King wrote: > On Mon, Oct 28, 2013 at 12:29:32PM +0100, Johan Herland wrote: >> > A hook-based solution could do this. But a built-in "all-purpose" >> > handler like "footer.Fixes.arg=commit", which was intended to be >> > reusable, wouldn't be able to do suc

Re: Show patch in gitk --first-parent ?

2013-10-30 Thread Andreas Schwab
Karl Wiberg writes: > With "gitk --first-parent", I get a graph that only follows the first > parent of every merge---perfect if you always merge topic branches > into the main branch. However, the diff shown is still the normal > merge diff, and not the diff between the new tree and the first >

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

2013-10-30 Thread Johan Herland
On Mon, Oct 28, 2013 at 11:10 PM, Thomas Rast wrote: > Johan Herland writes: >> But I still don't see exactly what this option should do (inside "git >> commit") that would end up being useful across most/all projects, and >> not just something that could more easily be implemented in the >> *com

Re: [PATCH] subtree: add makefile target for html docs

2013-10-30 Thread Junio C Hamano
Jeff King writes: > 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

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

2013-10-30 Thread Michael Haggerty
On 10/30/2013 11:57 AM, Ramkumar Ramachandra wrote: > Michael Haggerty wrote: >> "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 >>

Re: [PATCH] Avoid difference in tr semantics between System V and BSD

2013-10-30 Thread Junio C Hamano
Ben Walton writes: > Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V > semantics for tr whereby string1's length is truncated to the length > of string2 if string2 is shorter. The BSD semantics, as used by GNU tr > see string2 padded to the length of string1 using the final chara

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Torsten Bögershausen
On 2013-10-30 18.14, Torsten Bögershausen wrote: > On 2013-10-30 18.01, Vicent Martí wrote: >> On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: >>> There is a name clash under cygwin 1.7 (1.5 is OK) >>> The following "first aid hot fix" works for me: >>> /Torsten >> >> If Cygwin declar

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

2013-10-30 Thread Junio C Hamano
Jeff King writes: > 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 eff

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

2013-10-30 Thread Junio C Hamano
Jeff King writes: > On Sat, Oct 26, 2013 at 10:35:17AM +0200, Thomas Rast wrote: > ... >> Can you quote the *? I may have become somewhat paranoid, but still. >> This is the first use of the * syntax, and test_atom seems >> written to correctly quote its arguments, so why risk it? :-) > > Yeah,

Re: [PATCH] cvsserver: Determinize output to combat Perl 5.18 hash randomization

2013-10-30 Thread Junio C Hamano
Anders Kaseorg writes: > Perl 5.18 randomizes the seed used by its hash function, so iterating > through hashes results in different orders from run to run: > http://perldoc.perl.org/perl5180delta.html#Hash-overhaul > > This usually broke t9400 (gitcvs.dbname, gitcvs.ext.dbname, when > running

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

2013-10-30 Thread Michael Haggerty
On 10/30/2013 12:05 PM, Ramkumar Ramachandra wrote: > Michael Haggerty wrote: >> 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 *q >> { >>

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

2013-10-30 Thread Tony Luck
On Sat, Oct 26, 2013 at 6:34 PM, Josh Triplett wrote: > + format_commit_message(commit, "Fixes: %h ('%s')\n", sb, &ctx); What is the value of double wrapping the commit message inside '...' and then ('...')? -Tony -- To unsubscribe from this list: send the line "unsubscribe git" i

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Torsten Bögershausen
On 2013-10-30 18.01, Vicent Martí wrote: > On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: >> There is a name clash under cygwin 1.7 (1.5 is OK) >> The following "first aid hot fix" works for me: >> /Torsten > > If Cygwin declares its own bswap_64, wouldn't it be better to use it > i

Re: Show patch in gitk --first-parent ?

2013-10-30 Thread Karl Wiberg
On Wed, Oct 30, 2013 at 3:30 PM, Stefan Haller wrote: > I once posted a patch that adds a "First parent" checkbox to gitk's > window: > > > The patch no longer applies today, but I can send an updated version > that does, if there'

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

2013-10-30 Thread Junio C Hamano
Thomas Rast writes: > 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, >>> w

Re: [PATCH 07/19] compat: add endianness helpers

2013-10-30 Thread Vicent Martí
On Oct 30, 2013, at 9:25 AM, Jeff King wrote: > On Sat, Oct 26, 2013 at 09:55:36AM +0200, Thomas Rast wrote: > >>> The POSIX standard doesn't currently define a `nothll`/`htonll` >> >> typo: ntohll > > Thanks. > >>> function pair to perform network-to-host and host-to-network >>> swaps of 64-

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Vicent Martí
On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen wrote: > There is a name clash under cygwin 1.7 (1.5 is OK) > The following "first aid hot fix" works for me: > /Torsten If Cygwin declares its own bswap_64, wouldn't it be better to use it instead of overwriting it with our own? -- To unsubsc

Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

2013-10-30 Thread Torsten Bögershausen
On 2013-10-28 20.28, Junio C Hamano wrote: > * jk/pack-bitmap (2013-10-28) 20 commits There is a name clash under cygwin 1.7 (1.5 is OK) The following "first aid hot fix" works for me: /Torsten $ git diff diff --git a/compat/bswap.h b/compat/bswap.h index ea1a9ed..8dc39be 100644 --- a/compat/bswap

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

2013-10-30 Thread Junio C Hamano
Thomas Rast writes: > I figured this was easier on potential testers. As outlined in the > cover letter, I'll do the splitting and rebasing later. Sorry, I should have read 0/7 before responding, but the message came out of order. -- To unsubscribe from this list: send the line "unsubscribe git

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

2013-10-30 Thread Duy Nguyen
On Wed, Oct 30, 2013 at 10:55 PM, Jakub Narębski wrote: > On 2013-10-30 08:52, Stas Cherkassky wrote: >> >> >> Shallow clone (if that's what you meant) is not suitable because it >> doesn't allow to push/pull to/from this shallow repository. > > > Still? I think there were some work on making sha

Re: [PATCH 09/19] documentation: add documentation for the bitmap format

2013-10-30 Thread Vicent Marti
On Wed, Oct 30, 2013 at 11:23 AM, Shawn Pearce wrote: > The name-hash cache is probably important, but it would be nice to > have a variable or flag we can use to disable the name-cache > generation and thus permit Git to create JGit style v1 indexes, and > also use JGit v1 indexes if the name-cac

Re: [PATCH 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Shawn Pearce
On Wed, Oct 30, 2013 at 3:47 PM, Vicent Marti wrote: > On Wed, Oct 30, 2013 at 9:10 AM, Jeff King wrote: >> >> In fact, I'm not quite sure that even a partial reuse up to an offset is >> 100% safe. In a newly packed git repo it is, because we always put bases >> before deltas (and OFS_DELTA objec

Re: [PATCH 09/19] documentation: add documentation for the bitmap format

2013-10-30 Thread Vicent Marti
On Wed, Oct 30, 2013 at 11:23 AM, Shawn Pearce wrote: > On Wed, Oct 30, 2013 at 7:50 AM, Jeff King wrote: >> On Fri, Oct 25, 2013 at 01:47:06PM +, Shawn O. Pearce wrote: >> >>> I think Colby and I talked about having additional optional sections >>> in this file, but Colby didn't want to over

Re: [PATCH 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Vicent Marti
On Wed, Oct 30, 2013 at 11:38 AM, Shawn Pearce wrote: >> Since (1) is relatively rare, I think we are using this as a proxy for >> (2), so that we can do a regular walk rather than looking around for >> bitmaps that don't exist. But I may be misremembering the reasoning. >> Vicent? > > Ah. I am no

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

2013-10-30 Thread Jakub Narębski
On 2013-10-30 08:52, Stas Cherkassky wrote: Shallow clone (if that's what you meant) is not suitable because it doesn't allow to push/pull to/from this shallow repository. Still? I think there were some work on making shallow clone to allowing push/pull to/from it. I understand that general

Re: [PATCH 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Vicent Marti
On Wed, Oct 30, 2013 at 9:10 AM, Jeff King wrote: > > In fact, I'm not quite sure that even a partial reuse up to an offset is > 100% safe. In a newly packed git repo it is, because we always put bases > before deltas (and OFS_DELTA objects need this). But if you had a bitmap > generated from a fi

Re: Limiting disk usage

2013-10-30 Thread Fredrik Gustafsson
On Wed, Oct 30, 2013 at 04:39:02PM +0100, Jakub Narębski wrote: > From time to time you can find there ideas about adding "floating" > mode to git-submodule, but as far as I know up till now without > effect... How about git submodule update --remote ? -- Med vänliga hälsningar Fredrik Gustafsso

Re: Limiting disk usage

2013-10-30 Thread Jakub Narębski
On 2013-10-30 08:44, Piotr Krukowiecki wrote: On Tue, Oct 29, 2013 at 3:45 PM, Jakub Narębski wrote: On 2013-10-29 14:50, Piotr Krukowiecki wrote: If they are independent projects, they should get independent repositories; you can stitch them back together using git-submodule (or git-subtree

Re: [PATCH] Add option --no-tags

2013-10-30 Thread Thomas Rast
Nicolas Cornu writes: > 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(-) Th

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

2013-10-30 Thread Thomas Rast
DimanNe writes: >> 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 > > [

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

2013-10-30 Thread Marc Branchaud
On 13-10-30 10:49 AM, Nicolas Cornu wrote: > 2013/10/30 Marc Branchaud : >> On 13-10-30 08:47 AM, Nicolas Cornu wrote: >>> This is useful on all our repos, every times, as we put a tag per day. >>> If the HEAD didn't move during 150 days, we got 150 tags. >>> So, it depends, maybe can I put it as a

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

2013-10-30 Thread Nicolas Cornu
2013/10/30 Marc Branchaud : > On 13-10-30 08:47 AM, Nicolas Cornu wrote: >> This is useful on all our repos, every times, as we put a tag per day. >> If the HEAD didn't move during 150 days, we got 150 tags. >> So, it depends, maybe can I put it as an option in Edit > Preferences? > > Eek, even wit

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

2013-10-30 Thread Marc Branchaud
On 13-10-30 08:47 AM, Nicolas Cornu wrote: > This is useful on all our repos, every times, as we put a tag per day. > If the HEAD didn't move during 150 days, we got 150 tags. > So, it depends, maybe can I put it as an option in Edit > Preferences? Eek, even with a scrollbar, 150 tags seems like a

Re: Show patch in gitk --first-parent ?

2013-10-30 Thread Stefan Haller
Karl Wiberg wrote: > With "gitk --first-parent", I get a graph that only follows the first > parent of every merge---perfect if you always merge topic branches > into the main branch. However, the diff shown is still the normal > merge diff, and not the diff between the new tree and the first > p

Show patch in gitk --first-parent ?

2013-10-30 Thread Karl Wiberg
Hi all, With "gitk --first-parent", I get a graph that only follows the first parent of every merge---perfect if you always merge topic branches into the main branch. However, the diff shown is still the normal merge diff, and not the diff between the new tree and the first parent's tree---is it p

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

2013-10-30 Thread Nicolas Cornu
This is useful on all our repos, every times, as we put a tag per day. If the HEAD didn't move during 150 days, we got 150 tags. So, it depends, maybe can I put it as an option in Edit > Preferences? 2013/10/30 Johannes Sixt : > Am 10/30/2013 11:58, schrieb Nicolas Cornu: >> This scrollbar is not

eccellenza del lusso

2013-10-30 Thread fashionvipmagaz_2013
Eccellenza del lusso dirett...@fashionvipmagazine.com -- If you do not want to receive any more newsletters, http://dem.fashionvipmagazi

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

2013-10-30 Thread Johannes Sixt
Am 10/30/2013 11:58, schrieb Nicolas Cornu: > This scrollbar is not optional and is useful if there is a lot of tags or > branches. If this is the "only" case where the scrollbar is useful, i.e., it would be handy only once every other week, then it is better to remember that you can pan around in

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

2013-10-30 Thread Ramkumar Ramachandra
Michael Haggerty wrote: > 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 *q > { > int i; > int find_src = !query->src; > +

[PATCH v2] gitk: Add a horizontal scrollbar for commit history

2013-10-30 Thread Nicolas Cornu
This scrollbar is not optional and is useful if there is a lot of tags or branches. Signed-off-by: Nicolas Cornu --- gitk | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitk b/gitk index 5cd00d8..62563b1 100755 --- a/gitk +++ b/gitk @@ -2120,11 +2120,17 @@ proc makewi

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

2013-10-30 Thread Ramkumar Ramachandra
Michael Haggerty wrote: > "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

Re: [PATCH 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Shawn Pearce
On Wed, Oct 30, 2013 at 8:21 AM, Jeff King wrote: > On Fri, Oct 25, 2013 at 02:14:11PM +, Shawn O. Pearce wrote: >> On Thu, Oct 24, 2013 at 6:04 PM, Jeff King wrote: >> > For bitmaps to be used, the following must be true: >> > >> > 1. We must be packing to stdout (as a normal `pack-objects

Re: [PATCH v2 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Duy Nguyen
On Wed, Oct 30, 2013 at 2:36 PM, Jeff King wrote: > On Sat, Oct 26, 2013 at 05:25:14PM +0700, Nguyen Thai Ngoc Duy wrote: > >> > For bitmaps to be used, the following must be true: >> > >> > 1. We must be packing to stdout (as a normal `pack-objects` from >> > `upload-pack` would do). >> >

Re: [PATCH 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Shawn Pearce
On Wed, Oct 30, 2013 at 8:10 AM, Jeff King wrote: > On Fri, Oct 25, 2013 at 01:55:13PM +, Shawn O. Pearce wrote: >> >> Yay! This is similar to the optimization we use in JGit to send the >> entire pack, but the part about sending a leading prefix is new. Do >> you have any data showing how wel

Re: [PATCH 09/19] documentation: add documentation for the bitmap format

2013-10-30 Thread Shawn Pearce
On Wed, Oct 30, 2013 at 7:50 AM, Jeff King wrote: > On Fri, Oct 25, 2013 at 01:47:06PM +, Shawn O. Pearce wrote: > >> I think Colby and I talked about having additional optional sections >> in this file, but Colby didn't want to overcomplicate the format early >> on. So v1 is probably not very

Re: [PATCH v2] sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

2013-10-30 Thread Jeff King
On Wed, Oct 30, 2013 at 05:19:27AM -0400, Jeff King wrote: > > To achieve this, I guess we have to follow the same procedure we do for > > loose object creation: > > > > 1. Create a temporary directory with a unique name (mkdtemp?) > > > > 2. Adjust permissions > > > > 3. Rename into place >

Re: [PATCH v2] sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

2013-10-30 Thread Jeff King
On Sun, Oct 27, 2013 at 12:35:43PM +0100, Johan Herland wrote: > I didn't see this in the latest "What's cooking", so here's a resend, with > an expanded commit message to reflect our discussion. The patch itself is > unchanged. Thanks, your expanded description looks correct to me. > In order t

Re: [PATCH v4] remote-curl: fix large pushes with GSSAPI

2013-10-30 Thread Jeff King
On Tue, Oct 29, 2013 at 02:36:37AM +, brian m. carlson wrote: > if (large_request) { > + long authtype = 0; > + Minor nit, but this will produce an unused variable warning if the code in the #if below doesn't get compiled. I don't know how much we care. > +#if LIBCURL_VERSI

[PATCH] cvsserver: Determinize output to combat Perl 5.18 hash randomization

2013-10-30 Thread Anders Kaseorg
Perl 5.18 randomizes the seed used by its hash function, so iterating through hashes results in different orders from run to run: http://perldoc.perl.org/perl5180delta.html#Hash-overhaul This usually broke t9400 (gitcvs.dbname, gitcvs.ext.dbname, when running cmp on two .sqlite files) and t9402

Re: [PATCH 07/19] compat: add endianness helpers

2013-10-30 Thread Jeff King
On Sat, Oct 26, 2013 at 09:55:36AM +0200, Thomas Rast wrote: > > The POSIX standard doesn't currently define a `nothll`/`htonll` > > typo: ntohll Thanks. > > function pair to perform network-to-host and host-to-network > > swaps of 64-bit data. These 64-bit swaps are necessary for the on-disk >

Re: [PATCH 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Jeff King
On Fri, Oct 25, 2013 at 02:14:11PM +, Shawn O. Pearce wrote: > On Thu, Oct 24, 2013 at 6:04 PM, Jeff King wrote: > > For bitmaps to be used, the following must be true: > > > > 1. We must be packing to stdout (as a normal `pack-objects` from > > `upload-pack` would do). > > > > 2. Th

Re: [PATCH 12/19] rev-list: add bitmap mode to speed up object lists

2013-10-30 Thread Jeff King
On Fri, Oct 25, 2013 at 02:00:48PM +, Shawn O. Pearce wrote: > On Thu, Oct 24, 2013 at 6:06 PM, Jeff King wrote: > > Note that most of the time we spend for --count invocations is on > > generating the pack revindex. It may be worth storing a revidx (either > > in a separate file, as part of

Re: [PATCH 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Jeff King
On Fri, Oct 25, 2013 at 01:55:13PM +, Shawn O. Pearce wrote: > > As an extra optimization, when `prepare_bitmap_walk` succeeds, the > > `reuse_partial_packfile_from_bitmap` call can be attempted: it will find > > the amount of objects at the beginning of the on-disk packfile that can > > be re

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

2013-10-30 Thread Stas Cherkassky
Andrew, Shallow clone (if that's what you meant) is not suitable because it doesn't allow to push/pull to/from this shallow repository. I understand that generally git is designed to preserve the history. But the problem is real, and probably is not unique to our project. The fact that there ARE

Re: [PATCH 09/19] documentation: add documentation for the bitmap format

2013-10-30 Thread Jeff King
On Fri, Oct 25, 2013 at 01:47:06PM +, Shawn O. Pearce wrote: > I think Colby and I talked about having additional optional sections > in this file, but Colby didn't want to overcomplicate the format early > on. So v1 is probably not very extensible and we may have to go to v2 > to safely creat

Re: Limiting disk usage

2013-10-30 Thread Piotr Krukowiecki
On Tue, Oct 29, 2013 at 3:45 PM, Jakub Narębski wrote: > On 2013-10-29 14:50, Piotr Krukowiecki wrote: >> > Lot of code isn't problem, see Linux kernel or GCC, or LibreOffice.org OK, it depends on how much code is too much for you. I'm not talking about performance of git, just disk usage. In my

Re: [PATCH v2 18/19] t: add basic bitmap functionality tests

2013-10-30 Thread Jeff King
On Mon, Oct 28, 2013 at 11:13:47PM +0100, SZEDER Gábor wrote: > > + for i in `test_seq 1 10`; do > > + test_commit side-$i > > + done && > > Sorry, style nitpick: could you rewrite this command substitution > using $() like a few lines above? That is a nitpick. :P But sure, I've s

Re: [PATCH v2 11/19] pack-objects: use bitmaps when packing objects

2013-10-30 Thread Jeff King
On Sat, Oct 26, 2013 at 05:25:14PM +0700, Nguyen Thai Ngoc Duy wrote: > > For bitmaps to be used, the following must be true: > > > > 1. We must be packing to stdout (as a normal `pack-objects` from > > `upload-pack` would do). > > > > 2. There must be a .bitmap index containing at least

Re: [PATCH v2 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Jeff King
On Sat, Oct 26, 2013 at 05:14:16PM +0700, Nguyen Thai Ngoc Duy wrote: > If it's not mentioned yet, maybe you should note that this code > currently supports only one pack with .bitmap file. Yes, there's really not any point in having multiple .bitmap files, as the bitmaps need to be closed over t

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

2013-10-30 Thread Johannes Sixt
Am 10/29/2013 22:07, schrieb Torsten Bögershausen: > @@ -610,17 +623,17 @@ struct child_process *git_connect(int fd[2], const char > *url_orig, > } else > end = host; > > - path = strchr(end, c); > - if (path && !has_dos_drive_prefix(end)) { > - if (c == '

Re: [PATCH v2 10/19] pack-bitmap: add support for bitmap indexes

2013-10-30 Thread Jeff King
On Mon, Oct 28, 2013 at 08:22:07AM -0700, Junio C Hamano wrote: > > However, the code in the ewah/ directory has been hacked up a bit > > from its original, and ewah_io.c _does_ include "git-compat-util.h". > > So it may make sense to consider our copy a fork and git-ify it > > mor

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

2013-10-30 Thread Jeff King
On Tue, Oct 29, 2013 at 06:12:58PM -0700, Junio C Hamano wrote: > > I think it was just a simple mixup caused by Brian sending two fixups to > > t5570 as series, when they are really fixups for two different topics. > > Not worth an immediate v1.8.4.3, I think, but you may want to > > cherry-pick