Re: [PATCH v3 00/24] Index-v5

On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote: > Hi, > > previous rounds (without api) are at $gmane/202752, $gmane/202923, > $gmane/203088 and $gmane/203517, the previous rounds with api were at > $gmane/229732 and $gmane/230210. Thanks to Duy for reviewing the the > last round and Juni

Re: [PATCH v3 18/24] read-cache: write index-v5

On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: > Write the index version 5 file format to disk. This version doesn't > write the cache-tree data and resolve-undo data to the file. I keep having things to add after sending my emails. Now that we have all conflicted entries in file block,

[PATCH 1/3] Make test "using invalid commit with -C" more strict

In the test 'using invalid commit with -C' git-commit would have failed even if the -C option had been given the correct commit, as there was nothing to commit. Fix it by making sure there is always something to commit and git-commit fails because of the invalid commit provided to it. Signed-off-

[PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite

The test 'reset -p' uses git-reset -p, so it depends on the perl code. Signed-off-by: Kacper Kornet --- t/t7106-reset-unborn-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh index 8062cf5..499cd88 100755

[PATCH 2/3] t/t3701-add-interactive.sh: Add PERL prerequisite

The test 'patch mode ignores unmerged entries' uses git-add -p, so it depends on the perl code. Signed-off-by: Kacper Kornet --- t/t3701-add-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 9fab25c..8

[PATCH 0/3] Fixes for tests run without perl

This is a set of fixes for problems found while running test suite without perl installed. Kacper -- 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 v3 18/24] read-cache: write index-v5

On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: > +char *super_directory(const char *filename) > +{ > + char *slash; > + > + slash = strrchr(filename, '/'); > + if (slash) > + return xmemdupz(filename, slash-filename); > + return NULL; > +} > + Why is

[PATCH 1/3] Make test "using invalid commit with -C" more strict

In the test 'using invalid commit with -C' git-commit would have failed even if the -C option had been given the correct commit, as there was nothing to commit. Fix it by making sure there is always something to commit and git-commit fails because of the invalid commit provided to it. Signed-off-

[PATCH 0/3] Fixes for tests run without perl

This is a set of fixes for problems found while running test suite without perl installed. Kacper -- 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] write_index: optionally allow broken null sha1s

Commit 4337b58 (do not write null sha1s to on-disk index, 2012-07-28) unconditionally prevents git from writing null sha1s into the index. The intent was to catch errors in other parts of the code that might let such an entry slip into the index (or worse, a tree). However, some repositories have

Re: git-p4 out of memory for very large repository

On Fri, Aug 23, 2013 at 08:42:44PM +0100, Luke Diamand wrote: > > I think I've cloned files as large as that or larger. If you just want to > clone this and move on, perhaps you just need a bit more memory? What's the > size of your physical memory and swap partition? Per process memory limit? >

It is Utterly Private

It is Private I am George Daniels, a Banker and credit system programmer (HSBC bank). I saw your email address while browsing through the bank D.T.C Screen in my office yesterday so I decided to use this very chance to know you. I believe we should use every opportunity to know each other better.

[PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision

The 'todo' sheet for interactive rebase shows abbreviated SHA-1's and then performs its operations upon those shortened values. This can lead to an abort if the SHA-1 of a reworded or edited commit is no longer unique within the abbreviated SHA-1 space and a subsequent SHA-1 in the todo list has th

[PATCH v2 3/3] rebase -i: fix short SHA-1 collision

From: Junio C Hamano The 'todo' sheet for interactive rebase shows abbreviated SHA-1's and then performs its operations upon those shortened values. This can lead to an abort if the SHA-1 of a reworded or edited commit is no longer unique within the abbreviated SHA-1 space and a subsequent SHA-1

[PATCH v2 0/3] fix interactive rebase short SHA-1 collision bug

This is a re-roll of [1] which fixes a short SHA-1 collision bug during rebase -i. v1 graduated to 'next' quickly, before I was able to post a re-roll addressing Junio's review comments, so I instead posted fixes as incremental patches atop 'next' [2]. Also, after already in 'next', I discovered an

[PATCH v2 1/3] t3404: make tests more self-contained

As its very first action, t3404 installs (via set_fake_editor) a specialized $EDITOR which simplifies automated 'rebase -i' testing. Many tests rely upon this setting, thus tests which need a different editor must take extra care upon completion to restore $EDITOR in order to avoid breaking followi

Re: [PATCH v3 17/24] read-cache: read cache-tree in index-v5

On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: > +/* > + * This function modifies the directory argument that is given to it. > + * Don't use it if the directory entries are still needed after. > + */ There goes my hope of keeping directory_entry* in core so that at write-time, after val

[PATCH 4/6] test index-pack on packs with recoverable delta cycles

The previous commit added tests to show that index-pack correctly bails in unrecoverable situations. There are some situations where the data could be recovered, but it is not currently: 1. If we can break the cycle using an object from another pack via --fix-thin. 2. If we can break the

[PATCH 5/6] index-pack: optionally reject packs with duplicate objects

Git should never generate packs with duplicate objects. However, we may see such packs due to bugs in Git or other implementations (e.g., JGit had such a bug a few years ago). In theory, such packs should not be a problem for us (we will simply find one of the instances of the object when looking

[PATCH 6/6] default pack.indexDuplicates to false

We should never see duplicate objects in packs, and it is unknown what kind of complications such packs could create during the repacking process. The previous commit introduced a safety valve for checking packs coming into the repository and being indexed by index-pack. Let's turn the safety valv

[PATCH 3/6] add tests for indexing packs with delta cycles

If we receive a broken or malicious pack from a remote, we will feed it to index-pack. As index-pack processes the objects as a stream, reconstructing and hashing each object to get its name, it is not very susceptible to doing the wrong with bad data (it simply notices that the data is bogus and a

[PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

The sha1_entry_pos function tries to be smart about selecting the middle of a range for its binary search by looking at the value differences between the "lo" and "hi" constraints. However, it is unable to cope with entries with duplicate keys in the sorted list. We may hit a point in the search w

[PATCH 1/6] test-sha1: add a binary output mode

The test-sha1 helper program will run our internal sha1 routines over its input and output the 40-byte hex sha1. Sometimes, however, it is useful to have the binary 20-byte sha1 (and it's a pain to convert back in the shell). Let's add a "-b" option to output the binary version. Signed-off-by: Jef

[PATCHv3 0/6] duplicate objects and delta cycles

On Fri, Aug 23, 2013 at 02:24:10PM -0400, Jeff King wrote: > > This is somewhat tricky and may deserve an in-code comment. > > Do you want me to re-roll[...] Since there were a few things to fix, I went ahead and re-rolled. Here's v3, which changes: 1. Move "edge of run" logic description int

Re: [PATCH v3 15/24] read-cache: read index-v5

Nit, add_part_to_conflict_entry(), create_new_conflict() and related structures/macros are not used in this patch. The first caller is in the next patch (read resolve-undo data). -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kern

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

On Fri, Aug 23, 2013 at 09:41:39PM +0200, Johannes Sixt wrote: > Am 23.08.2013 01:14, schrieb Jeff King: > >+++ b/t/t5308-pack-detect-duplicates.sh > >@@ -0,0 +1,73 @@ > >+#!/bin/sh > >+ > >+test_description='handling of duplicate objects in incoming packfiles' > >+. ./test-lib.sh > >+. ../lib-pac

[ANNOUNCE] Git v1.8.4

The latest feature release Git v1.8.4 is now available at the usual places. It contains 870+ changes from ~100 contributors (among which 33 people are new) since v1.8.3. We will have two more releases til the end of this year; the release after that could be Git 2.0. The release tarballs are fou

Re: [PATCH v2 0/2] fix t3010 failure when core.ignorecase=true

Eric Sunshine writes: > Recent mailing list discussion [2][3] suggests that changes at a more > fundamental level (if they pan out) would be a more appropriate approach > to resolving this bug. Such an approach would (happily) make patch 2/2 > unnecessary, however, I'm posting this series for po

Re: [PATCH v2 0/2] fix t3010 failure when core.ignorecase=true

On Fri, Aug 23, 2013 at 5:00 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> Recent mailing list discussion [2][3] suggests that changes at a more >> fundamental level (if they pan out) would be a more appropriate approach >> to resolving this bug. Such an approach would (happily) make pa

Re: [PATCH] git-commit: search author pattern against mailmap

Antoine Pelisse writes: > On Fri, Aug 23, 2013 at 9:03 PM, Junio C Hamano wrote: >> OK, so how about labelling it as a bugfix, like this perhaps? We >> obviously need a test or two, though. > > OK, > I will resubmit tomorrow with some tests. Thanks. Also, after I sent out that "like this" pat

[PATCH v2 2/2] dir: fix core.ignorecase inconsistency with missing '/'

Although undocumented, directory_exists_in_index_icase(dirname,len) unconditionally assumes the presence of a '/' at dirname[len], despite being past the end-of-string. Callers are expected to respect this assumption by ensuring that a '/' is present beyond the last character of the passed path. d

[PATCH v2 0/2] fix t3010 failure when core.ignorecase=true

This is a re-roll of [1] which fixes a bug in dir.c resulting in failure of a newly added test in t3010 when core.ignorecase=true. Recent mailing list discussion [2][3] suggests that changes at a more fundamental level (if they pan out) would be a more appropriate approach to resolving this bug.

[PATCH v2 1/2] t3103: demonstrate dir.c:treat_one_path() core.ignorecase failure

2eac2a4cc4bdc8d7 (ls-files -k: a directory only can be killed if the index has a non-directory; 2013-08-15) adds a caller of directory_exists_in_index(dirname,len) which forgets to satisfy the undocumented requirement that a '/' must be present at dirname[len] (despite being past the end-of-string)

Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

On Fri, Aug 23, 2013 at 3:25 AM, Matthieu Moy wrote: > This is assuming you follow the scheme > > git -> local repo for other vcs -> remote repo for other vcs > > which itself more or less assumes that the other VCS is a decentralized > VCS. I understand this is a good idea for hg or bzr remote

Re: CPPCheck found 24 high risk bugs in Git v.1.8.3.4 (fetch.c L588)

From: "Philip Oakley" Sent: Monday, August 19, 2013 10:46 PM From: "Koch, Rick (Subcontractor)" Ran CPPCheck 1.5.6 on Windows-XP. Hi Rick, Thank you for the clarification. Normal practice on the list is to use Reply All, so everyone can participate in the discussion. It looks like most o

Re: [PATCH] git-commit: search author pattern against mailmap

On Fri, Aug 23, 2013 at 9:03 PM, Junio C Hamano wrote: > OK, so how about labelling it as a bugfix, like this perhaps? We > obviously need a test or two, though. OK, I will resubmit tomorrow with some tests. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a messa

Re: git-p4 out of memory for very large repository

I think I've cloned files as large as that or larger. If you just want to clone this and move on, perhaps you just need a bit more memory? What's the size of your physical memory and swap partition? Per process memory limit? On 23 Aug 2013 12:59, "Corey Thompson" wrote: On 23/08/13 12:59, Corey

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

Am 23.08.2013 01:14, schrieb Jeff King: +++ b/t/t5308-pack-detect-duplicates.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +test_description='handling of duplicate objects in incoming packfiles' +. ./test-lib.sh +. ../lib-pack.sh This should be . "$TEST_DIRECTORY"/lib-pack.sh to support running tests with

Re: [PATCH] Remove dead link

On Fri, Aug 23 2013, Junio C Hamano wrote: > That is unfortunate, especially given the last line that the patch > removes. Has anybody asked pastebin folks why it is gone and if it > can be resurrected? Way Back Machine has nothing. What was under that link? If IRC logs, then those appear to be

Re: [PATCH] git-commit: search author pattern against mailmap

Jeff King writes: >> But for that old and established "--author parameter that does not >> use the standard format guesses" feature to be useful, I agree that >> it should honor the mailmap. >> >> I wonder if it would hurt anybody if we made this unconditional, not >> even with "--no-mailmap" ov

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

On Fri, Aug 23, 2013 at 02:54:19PM -0400, Nicolas Pitre wrote: > On Fri, 23 Aug 2013, Jeff King wrote: > > > Making the deltas was considerably less elegant, since we cannot provoke > > pack-objects to pick arbitrary deltas (and it will not even try to delta > > tiny objects, anyway, which would

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

On Fri, 23 Aug 2013, Jeff King wrote: > Making the deltas was considerably less elegant, since we cannot provoke > pack-objects to pick arbitrary deltas (and it will not even try to delta > tiny objects, anyway, which would bloat our samples). I ended up with > the horrible patch below. We _could_

Re: t3010 broken by 2eac2a4

On Fri, Aug 23, 2013 at 10:15:55AM -0700, Junio C Hamano wrote: > When 5102c617 (Add case insensitivity support for directories when > using git status, 2010-10-03) added the directories to the name-hash > with trailing slash, there was only a single name hash table to > which both real cache entr

Re: [PATCH] git-commit: search author pattern against mailmap

On Fri, Aug 23, 2013 at 10:44:03AM -0700, Junio C Hamano wrote: > My initial reaction was "Why should something as important as 'git > commit' should be playing a guessing-game?" ;-) and I am kind of > ashamed to have added 146ea068 (git commit --author=$name: look > $name up in existing commits,

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

On Fri, Aug 23, 2013 at 09:41:57AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Furthermore, we know that one of our endpoints must be > > the edge of the run of duplicates. For example, given this > > sequence: > > > > idx 0 1 2 3 4 5 > > key A C C C C D > > > > If we are searching

Re: How to set tab size for hunks in “git add -p”?

On Fri, Aug 23, 2013 at 7:28 PM, Янчарук Александр wrote: > But those settings seems does not affect on |git add -p|. How to set tab > size for hunks in *git add -p* command? That's because "git add -p" doesn't go through less/pager. You can certainly change the tabs size for your terminal with "

Re: [PATCHv2] git-diff: Clarify operation when not inside a repository.

> From: Junio C Hamano > I suspect that it may be a good idea to split the section altogether > to reduce confusion like what triggered this thread, e.g. > > 'git diff' [--options] [--] [...]:: > > This form is to view the changes you made relative to > the index (st

Re: [PATCH] Remove dead link

Michal Nazarewicz writes: > From: Michal Nazarewicz > > Signed-off-by: Michal Nazarewicz > --- > Documentation/technical/pack-heuristics.txt | 6 -- > 1 file changed, 6 deletions(-) > > diff --git a/Documentation/technical/pack-heuristics.txt > b/Documentation/technical/pack-heuristics.tx

Re: [PATCH] git-commit: search author pattern against mailmap

Antoine Pelisse writes: > When committing for someone else, using the --author option, it can be > nice to use the mailmap file to find the correct name spelling and email > address. > > Currently, you would have to find the correct mapping in mailmap file > first, and then use the full ident for

How to set tab size for hunks in “git add -p”?

Hi! I used the solution from here to change tab size in |git diff||| output. That works fine with git diff. I have these settings in my *.gitconfig*: |[core] whitespace = tabsize=4,indent-with-

Re: [PATCH 1/2] t3103: demonstrate dir.c:treat_one_path() core.ignorecase failure

Eric Sunshine writes: > @@ -21,4 +22,18 @@ test_expect_success 'ls-tree fails with non-zero exit code > on broken tree' ' > test_must_fail git ls-tree -r HEAD > ' > > +test_expect_failure 'ls-tree directory core.ignorecase' ' > + cat >expect <<-\EOF && > + d/e/f > + EOF > +

Re: t3010 broken by 2eac2a4

Eric Sunshine writes: > On Fri, Aug 23, 2013 at 1:36 AM, Junio C Hamano wrote: >> Eric Sunshine writes: >> >>> I sent a patch [1] which resolves the problem, although the solution >>> is not especially pretty (due to some ugliness in the existing >>> implementation). >> >> Yeah, thanks. >> >> I

Re: [PATCH 2/6] sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP

Jeff King writes: > Furthermore, we know that one of our endpoints must be > the edge of the run of duplicates. For example, given this > sequence: > > idx 0 1 2 3 4 5 > key A C C C C D > > If we are searching for "B", we might hit the duplicate run > at lo=1, hi=3 (e.g., by first mi=3, then mi

Re: [PATCH] Remove dead link

> From: Michal Nazarewicz > > Signed-off-by: Michal Nazarewicz > --- > Documentation/technical/pack-heuristics.txt | 6 -- > 1 file changed, 6 deletions(-) > > diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/tech > nical/pack-heuristics.txt > index 8b7ae1c..b7bd951

[PATCH] Remove dead link

From: Michal Nazarewicz Signed-off-by: Michal Nazarewicz --- Documentation/technical/pack-heuristics.txt | 6 -- 1 file changed, 6 deletions(-) diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt index 8b7ae1c..b7bd951 100644 --- a/Docume

[PATCH] git-commit: search author pattern against mailmap

When committing for someone else, using the --author option, it can be nice to use the mailmap file to find the correct name spelling and email address. Currently, you would have to find the correct mapping in mailmap file first, and then use the full ident form when committing. Let's allow git-c

[BUGLET] git bisect visualize does not show BISECT_HEAD

[v1.8.3.4] "git bisect visualize" when run without --no-checkout has the standard gitk handling of "HEAD" showing what the current revision being tested is (as a yellow node). Now when using --no-checkout, the information "current revision" we may be looking for has nothing to do with HEAD any

Re: git-p4 out of memory for very large repository

On Fri, Aug 23, 2013 at 07:48:56AM -0400, Corey Thompson wrote: > Sorry, I guess I could have included more details in my original post. > Since then, I have also made an attempt to clone another (slightly more > recent) branch, and at last had success. So I see this does indeed > work, it just se

Re: git-p4 out of memory for very large repository

On Fri, Aug 23, 2013 at 08:16:58AM +0100, Luke Diamand wrote: > On 23/08/13 02:12, Corey Thompson wrote: > >Hello, > > > >Has anyone actually gotten git-p4 to clone a large Perforce repository? > > Yes. I've cloned repos with a couple of Gig of files. > > >I have one codebase in particular that g

Re: t3010 broken by 2eac2a4

On Fri, Aug 23, 2013 at 1:36 AM, Junio C Hamano wrote: > Eric Sunshine writes: > >> I sent a patch [1] which resolves the problem, although the solution >> is not especially pretty (due to some ugliness in the existing >> implementation). > > Yeah, thanks. > > I tend to agree with you that fixing

[PATCH] Documentation/fast-import: clarify summary for `feature` command

In most cases, "feature " does not just require that the feature exists, but also changes the behavior to enable it. Cases where the feature is only requested like cat-blob, notes or ls are clearly documented below. Signed-off-by: Matthieu Moy --- Documentation/git-fast-import.txt | 4 ++-- 1 f

Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

Felipe Contreras writes: > On Wed, Aug 21, 2013 at 4:36 PM, Matthieu Moy > wrote: >> Felipe Contreras writes: >> >>> On Tue, Aug 13, 2013 at 8:31 AM, Matthieu Moy wrote: >>> Felipe: Is this the right fix for git-remote-mediawiki? Any better idea? >>> >>> Why not keep track of the revision

Re: git-p4 out of memory for very large repository

On 23/08/13 02:12, Corey Thompson wrote: Hello, Has anyone actually gotten git-p4 to clone a large Perforce repository? Yes. I've cloned repos with a couple of Gig of files. I have one codebase in particular that gets to about 67%, then consistently gets get-fast-import (and often times a fe