Just like it...

2013-12-16 Thread Inglina
Die Nike Breeze maximale Leitungs ihre endlosen Treck voraus zu bleiben , wenn der Kalender Flips, mit dem nächsten Modell innerhalb Lineup auf Ihre Umwelt Nike Max + 2014. Unnötig zu sagen, es ist ein bisschen früh in der Videospiel sogar zu sprechen über Design auf , so dass vollständig ist , das

Re: [PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly

2013-12-16 Thread Samuel Bronson
On Mon, Dec 16, 2013 at 4:32 PM, Junio C Hamano wrote: > Samuel Bronson writes: > >> for i in 1 2 >> do >> test_expect_success "orderfile using option ($i)" ' >> git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual && >> test_cmp expect_$i actual >> ' > > This funny inden

[PATCH] log: properly handle decorations with chained tags

2013-12-16 Thread brian m. carlson
git log did not correctly handle decorations when a tag object referenced another tag object that was no longer a ref, such as when the second tag was deleted. The commit would not be decorated correctly because parse_object had not been called on the second tag and therefore its tagged field had

Re: [PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly

2013-12-16 Thread Samuel Bronson
On Mon, Dec 16, 2013 at 4:09 PM, Junio C Hamano wrote: > Samuel Bronson writes: >> +test_expect_success 'unreadable orderfile' ' >> + touch unreadable_file && >> + chmod -r unreadable_file && > - this test probably needs restricted to people with sane > filesystems; I think POSIXP

Re: git log --no-walk --tags produces strange result for certain user

2013-12-16 Thread brian m. carlson
On Mon, Dec 16, 2013 at 03:52:35PM +0400, Kirill Likhodedov wrote: > > Hi everybody, > > I received one more complaint for this issue, and now it appears in a public > repository https://github.com/spray/spray > > To reproduce: > > # git clone https://github.com/spray/spray > # cd spray > #

Re: [PATCH v2 02/21] path.c: rename vsnpath() to git_vsnpath()

2013-12-16 Thread Ramsay Jones
On 16/12/13 17:11, Jonathan Nieder wrote: > Duy Nguyen wrote: Ramsay Jones wrote: > > :-D I renamed this _from_ git_vsnpath() in commit 5b3b8fa2 ("path.c: > Remove the > 'git_' prefix from a file scope function", 04-09-2012), because ... well > it's a > file scope functi

Re: [PATCH] git-svn: Support svn:global-ignores property

2013-12-16 Thread Eric Wong
Aleksey Vasenev wrote: > --- What Thomas said about commit messages. Note: I hardly use git-svn or SVN anymore and don't pay attention to SVN changes. Some style nitpicks: > @@ -1304,16 +1318,20 @@ sub cmd_create_ignore { > # which git won't track > mkpath([$path])

Re: [PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly

2013-12-16 Thread Junio C Hamano
Samuel Bronson writes: > for i in 1 2 > do > test_expect_success "orderfile using option ($i)" ' > git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual && > test_cmp expect_$i actual > ' This funny indentation in the previous step needs to be fixed, and the added block b

Re: [PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly

2013-12-16 Thread Junio C Hamano
Samuel Bronson writes: > diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh > index 398b3f6..eb471e7 100755 > --- a/t/t4056-diff-order.sh > +++ b/t/t4056-diff-order.sh > @@ -61,12 +61,35 @@ test_expect_success "no order (=tree object order)" ' > test_cmp expect_none actual > ' >

Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-16 Thread Junio C Hamano
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

[PATCH v2 2/2] diff: avoid some nesting

2013-12-16 Thread Thomas Gummerer
Avoid some nesting in builtin/diff.c, to make the code easier to read. There are no functional changes. Helped-by: Jonathan Nieder Signed-off-by: Thomas Gummerer --- builtin/diff.c | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/builtin/

[PATCH v2 1/2] diff: add test for --no-index executed outside repo

2013-12-16 Thread Thomas Gummerer
470faf9 diff: move no-index detection to builtin/diff.c breaks the error message for "git diff --no-index", when the command is executed outside of a git repository and the wrong number of arguments are given. 6df5762 diff: don't read index when --no-index is given fixes the problem. Add a test to

Re: [PATCH v2 02/21] path.c: rename vsnpath() to git_vsnpath()

2013-12-16 Thread Junio C Hamano
Jonathan Nieder writes: > Duy Nguyen wrote: Ramsay Jones wrote: > > :-D I renamed this _from_ git_vsnpath() in commit 5b3b8fa2 ("path.c: > Remove the > 'git_' prefix from a file scope function", 04-09-2012), because ... well > it's a > file scope function! (i.e. the git

Re: Unexpected cherry-pick behaviour

2013-12-16 Thread Junio C Hamano
"Philip Oakley" writes: > From: "Philip Oakley" >> From: "Junio C Hamano" , Saturday, December 14, >> 2013 7:39 PM >>> "Philip Oakley" writes: >>> Would this be a good use of the * Magic pathspecs like ":(icase) that was recently released (v1.8.5 2Dec13) so that the merge >>

[PATCH v4 1/3] diff: Tests for "git diff -O"

2013-12-16 Thread Samuel Bronson
Heavily adapted from Anders' patch: "diff: Add diff.orderfile configuration variable" Signed-off-by: Anders Waldenborg Signed-off-by: Samuel Bronson --- t/t4056-diff-order.sh | 72 +++ 1 file changed, 72 insertions(+) create mode 100755 t/t4056-d

[PATCH v4 3/3] diff: Add diff.orderfile configuration variable

2013-12-16 Thread Samuel Bronson
diff.orderfile acts as a default for the -O command line option. [sb: split up aw's original patch; reworked tests and docs, treat option as pathname] Signed-off-by: Anders Waldenborg Signed-off-by: Samuel Bronson --- Documentation/diff-config.txt | 5 + Documentation/diff-options.txt |

[PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly

2013-12-16 Thread Samuel Bronson
The -O flag really shouldn't silently fail to do anything when given a path that it can't read from. However, it should be able to read from un-mmappable files, such as: * pipes/fifos * /dev/null: It's a character device (at least on Linux) * ANY empty file: Quoting Linux mmap(2), "SUSv

[PATCH v4 0/3] diff: Add diff.orderfile configuration variable

2013-12-16 Thread Samuel Bronson
The original purpose of this patch [series] was to allow specifying the "-O" option for "git diff" in the config. In this version, I've revised the commit message for patch 2, changed patch 3 to use git_config_pathname() instead of git_config_string(), and removed the FIXME from patch 3's commit m

Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-16 Thread Jeff King
On Fri, Dec 06, 2013 at 10:38:46AM +1100, Zoltan Klinger wrote: > @@ -2928,7 +2933,14 @@ static void run_external_diff(const char *pgm, > } > *arg = NULL; > fflush(NULL); > - retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL); > + > + env[0] = env_counter; > + snp

Re: [PATCH 1/2] diff: add test for --no-index executed outside repo

2013-12-16 Thread Junio C Hamano
Thomas Gummerer writes: > 470faf9 diff: move no-index detection to builtin/diff.c breaks the error > message for "git diff --no-index", when the command is executed outside > of a git repository and the wrong number of arguments are given. 6df5762 > diff: don't read index when --no-index is given

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Junio C Hamano
Jeff King writes: > On Mon, Dec 16, 2013 at 11:19:33AM -0800, Jonathan Nieder wrote: > >> > I was tempted to explicitly say something like "this is >> > opaque and meaningless to you, don't rely on it", but I don't know that >> > there is any need. >> [...] >> > On top of jk/name-pac

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Jeff King
On Mon, Dec 16, 2013 at 11:33:11AM -0800, Junio C Hamano wrote: > > to determine the name of the created file. > > When this option is used, the two files are written in > > -.{pack,idx} files. is a hash > > + of the bytes of the packfile, and is written to the standard > > "hash

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Junio C Hamano
Jeff King writes: > I was tempted to explicitly say something like "this is > opaque and meaningless to you, don't rely on it", but I don't know that > there is any need. Thanks. When we did the original naming, it was envisioned that we may use the name for fsck to make sure that the pack cont

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Jeff King
On Mon, Dec 16, 2013 at 11:19:33AM -0800, Jonathan Nieder wrote: > > I was tempted to explicitly say something like "this is > > opaque and meaningless to you, don't rely on it", but I don't know that > > there is any need. > [...] > > On top of jk/name-pack-after-byte-representations

[PATCH 2/2] diff: avoid some nesting

2013-12-16 Thread Thomas Gummerer
Avoid some nesting in builtin/diff.c, to make the code easier to read. No functional changes. Helped-by: Jonathan Nieder Signed-off-by: Thomas Gummerer --- This is based on comments by Jonathan on the version that is already next. builtin/diff.c | 35 +-- 1 fil

[PATCH 1/2] diff: add test for --no-index executed outside repo

2013-12-16 Thread Thomas Gummerer
470faf9 diff: move no-index detection to builtin/diff.c breaks the error message for "git diff --no-index", when the command is executed outside of a git repository and the wrong number of arguments are given. 6df5762 diff: don't read index when --no-index is given fixes the problem. Add a test to

Re: [RFC v3 3/3] diff: Add diff.orderfile configuration variable

2013-12-16 Thread Samuel Bronson
On Mon, Dec 16, 2013 at 1:53 PM, Junio C Hamano wrote: > Samuel Bronson writes: > Path-like parameters and values given by the end user should be > relative to the directory where the end user is (i.e. both -O > parameters in the above example name docs/orderfile). All Git > processes, even the

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Jonathan Nieder
Jeff King wrote: > The original patch is in next, so here's one on top. I just updated the > description. Thanks. > I was tempted to explicitly say something like "this is > opaque and meaningless to you, don't rely on it", but I don't know that > there is any need. [...] > On top o

Re: Subtree: My Status

2013-12-16 Thread Junio C Hamano
Adam Spiers writes: >> Somebody take the ownership of the area, if David Green who earlier >> volunteered to do so and worked on it needs help reviewing, helping >> polishing and giving thumbs-up on the patches, perhaps? > > I *may* be able to help a bit in the coming weeks, given that it's > rea

Re: "git fsck" fails on malloc of 80 G

2013-12-16 Thread Jeff King
On Mon, Dec 16, 2013 at 11:05:32AM -0500, Dale R. Worley wrote: > # git fsck > Checking object directories: 100% (256/256), done. > fatal: Out of memory, malloc failed (tried to allocate 80530636801 bytes) > # Can you give you give us a backtrace from the die() call? It would help to know what it

Re: Looking for pre-commit hook to check whitespace errors but not for all files

2013-12-16 Thread Junio C Hamano
Paul Menzel writes: > 1. Only the files actually committed should be checked. That means > running `git commit -a`, abort that and then running `git commit > some/file` should only check `some/file` for whitespace errors. Doesn't hooks/pre-commit.sample we ship already gets this right?

Re: [PATCH] pack-objects: name pack files after trailer hash

2013-12-16 Thread Jeff King
On Mon, Dec 16, 2013 at 08:41:38AM +0100, Michael Haggerty wrote: > The old naming scheme is documented in > Documentation/git-pack-objects.txt, under "OPTIONS" -> "base-name": > > > base-name:: > > Write into a pair of files (.pack and .idx), using > > to determine the name of the creat

Re: Unexpected cherry-pick behaviour

2013-12-16 Thread Philip Oakley
From: "Philip Oakley" From: "Junio C Hamano" , Saturday, December 14, 2013 7:39 PM "Philip Oakley" writes: Would this be a good use of the * Magic pathspecs like ":(icase) that was recently released (v1.8.5 2Dec13) so that the merge stages can be named. Because the pathspec mechahis

Re: [RFC v3 3/3] diff: Add diff.orderfile configuration variable

2013-12-16 Thread Junio C Hamano
Samuel Bronson writes: > diff.orderfile acts as a default for the -O command line option. > > [sb: split up aw's original patch; reworked tests and docs] > > [FIXME: Relative paths should presumably be interpreted relative to > repository root; how should this be accomplished?] Do you mean somet

Re: [PATCH v3 2/3] diff: Let "git diff -O" read orderfile from any file, failing when appropriate

2013-12-16 Thread Junio C Hamano
Samuel Bronson writes: > The -O flag really shouldn't silently fail to do anything when given a > path that it can't read from. > > However, it should be able to read from un-mappable files, such as > pipes/fifos, /dev/null (as we document in the next patch), or in fact > *any* empty file (since

Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-16 Thread Junio C Hamano
Thomas Gummerer writes: >> What happens if I run 'git diff --no-index /tmp git.c git.c' from >> within a git repository? With this, I fear I will get > > Thanks, I've missed that one. It only happens when run outside a git > repository, but the same comments still apply. Will fix and send a >

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-16 Thread Junio C Hamano
Nicolas Vigier writes: > On Sun, 15 Dec 2013, Junio C Hamano wrote: > >> Besides, we would need at least something like this to make sure >> that people have a way to selectively disable configured default >> when necessary, perhaps like this. > > This looks like a good idea. I said "at least" b

Re: [PATCH v2 02/21] path.c: rename vsnpath() to git_vsnpath()

2013-12-16 Thread Jonathan Nieder
Duy Nguyen wrote: >>> Ramsay Jones wrote: :-D I renamed this _from_ git_vsnpath() in commit 5b3b8fa2 ("path.c: Remove the 'git_' prefix from a file scope function", 04-09-2012), because ... well it's a file scope function! (i.e. the git_ prefix implies greater than file

Re: [PATCH] test the commit.gpgsign config option

2013-12-16 Thread Junio C Hamano
Nicolas Vigier writes: > The tests are checking that : > > - when commit.gpgsign is true, "git commit" creates signed commits > > - when commit.gpgsign is false, "git commit" creates unsigned commits > > - when commit.gpgsign is true, "git commit --no-gpg-sign" creates > unsigned commits > > -

"git fsck" fails on malloc of 80 G

2013-12-16 Thread Dale R. Worley
I have a large repository (17 GiB of disk used), although no single file in the repository is over 1 GiB. (I have pack.packSizeLimit set to "1g".) I don't know how many files are in the repository, but it shouldn't exceed several tens of commits each containing several tens of thousands of files.

gitk's back button broken (Refactor per-line part of getblobdiffline and its support)

2013-12-16 Thread Johannes Sixt
To reproduce, start gitk in any repository, click a commit, then the "back" button (left-pointing arrow button) or type Alt+Cursor-Left. The error I get is this: can't use non-numeric string as operand of "!" can't use non-numeric string as operand of "!" while executing "if {!$ateof} {

[PATCH] test the commit.gpgsign config option

2013-12-16 Thread Nicolas Vigier
The tests are checking that : - when commit.gpgsign is true, "git commit" creates signed commits - when commit.gpgsign is false, "git commit" creates unsigned commits - when commit.gpgsign is true, "git commit --no-gpg-sign" creates unsigned commits - when commit.gpgsign is true, "git rebase

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-16 Thread Nicolas Vigier
On Sun, 15 Dec 2013, Junio C Hamano wrote: > Junio C Hamano writes: > > > [Stalled] > > > > * nv/commit-gpgsign-config (2013-11-06) 1 commit > > - Add the commit.gpgsign option to sign all commits > > > > Introduce commit.gpgsign configuration variable to force every > > commit to be GPG sign

Re: git log --no-walk --tags produces strange result for certain user

2013-12-16 Thread Kirill Likhodedov
Hi everybody, I received one more complaint for this issue, and now it appears in a public repository https://github.com/spray/spray To reproduce: # git clone https://github.com/spray/spray # cd spray # git log --no-walk --tags --pretty="%H %d" --decorate=full | tail -3 3273edafcd9f9701d62e0

[PATCH] zsh completion: 5.0.3 compat, use emulate

2013-12-16 Thread Phil Pennock
The bash completion pulled into zsh was being pulled in _as_ zsh, but used patterns which relied on falling through as unhandled. In zsh 5.0.3 this no longer works, resulting in: __git_complete_remote_or_refspec:33: bad pattern: +* Fix by telling zsh to emulate sh while sourcing the bash con