[PATCH 19/21] index-pack, pack-objects: allow creating .idx v2 with .pack v4

While .idx v3 is recommended because it's smaller, there is no reason why .idx v2 can't use with .pack v4. Enable it, at least for the test suite as some tests need to this kind of information from show-index and show-index does not support .idx v3. Signed-off-by: Nguyễn Thái Ngọc Duy --- builti

[PATCH 21/21] t1050, t5500: replace the use of "show-index|wc -l" with verify-pack

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t1050-large.sh | 9 + t/t5500-fetch-pack.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/t/t1050-large.sh b/t/t1050-large.sh index fd10528..829030b 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -32,7 +32

[PATCH 20/21] show-index: acknowledge that it does not read .idx v3

show-index takes .idx from stdin while v3 requires the .pack. It's used for testing purposes only. Let those test scripts force .idx v2 with index-pack. Signed-off-by: Nguyễn Thái Ngọc Duy --- show-index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/show-index.c b/show

[PATCH 16/21] unpack-objects: decode v4 commits

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 60 1 file changed, 60 insertions(+) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index f8442f4..6fc72c1 100644 --- a/builtin/unpack-objects.c +++ b/builtin/un

[PATCH 18/21] unpack-objects: decode v4 trees

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 191 ++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 044a087..9fd5640 100644 --- a/builtin/unpack-objects.c

[PATCH 17/21] unpack-objects: allow to save processed bytes to a buffer

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 17 + 1 file changed, 17 insertions(+) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 6fc72c1..044a087 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -54,6 +54,9 @

[PATCH 11/21] unpack-objects: report missing object name

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 2217d7b..6d0a65c 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -193,7 +193,7 @@

[PATCH 12/21] unpack-objects: recognize end-of-pack in v4 thin pack

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 6d0a65c..c9eb31d 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c

[PATCH 13/21] unpack-objects: read v4 dictionaries

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 50 1 file changed, 50 insertions(+) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index c9eb31d..1a3c30e 100644 --- a/builtin/unpack-objects.c +++ b/builtin/un

[PATCH 15/21] unpack-objects: decode v4 ref-delta

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 25 ++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index a906a98..f8442f4 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-ob

[PATCH 14/21] unpack-objects: decode v4 object header

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/unpack-objects.c | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 1a3c30e..a906a98 100644 --- a/builtin/unpack-objects.c +++ b/bui

[PATCH 10/21] pack v4: add a note that streaming does not support OBJ_PV4_*

Signed-off-by: Nguyễn Thái Ngọc Duy --- streaming.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streaming.c b/streaming.c index debe904..c7edebb 100644 --- a/streaming.c +++ b/streaming.c @@ -437,7 +437,7 @@ static open_method_decl(pack_non_delta) unuse_pack(&wind

[PATCH 08/21] pack-objects: respect compression level in v4

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 5 +++-- packv4-create.c| 17 ++--- packv4-create.h| 6 -- test-packv4.c | 9 + 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/p

[PATCH 02/21] fixup! pack-objects: support writing pack v4

Signed-off-by: Nguyễn Thái Ngọc Duy --- by setting usable_delta to zero, I disable tree delta in pack-objects. Some test cases spotted this. builtin/pack-objects.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c in

[PATCH 04/21] fixup! index-pack: parse v4 header and dictionaries

Signed-off-by: Nguyễn Thái Ngọc Duy --- empty pack case builtin/index-pack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 8a6e2a3..89bc708 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1474,7 +1474,8

[PATCH 07/21] pack v4: move pv4 objhdr parsing code to packv4-parse.c

Signed-off-by: Nguyễn Thái Ngọc Duy --- packv4-parse.c | 12 packv4-parse.h | 5 + sha1_file.c| 9 ++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/packv4-parse.c b/packv4-parse.c index 80ad6fc..7a43635 100644 --- a/packv4-parse.c +++ b/packv4-pars

[PATCH 03/21] fixup! pack v4: support "end-of-pack" indicator in index-pack and pack-objects

Signed-off-by: Nguyễn Thái Ngọc Duy --- nr_objects contains a lot more than the number of objects to be written. builtin/pack-objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b60b1a0..39d1e08 100644 --- a/built

[PATCH 09/21] pack-objects: recognize v4 as pack source

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 28 +--- packv4-parse.h | 2 ++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 63c9b9e..ac25973 100644 --- a/builtin/pack-objec

[PATCH 05/21] fixup! index-pack: record all delta bases in v4 (tree and ref-delta)

Signed-off-by: Nguyễn Thái Ngọc Duy --- compiler warning fix builtin/index-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 89bc708..1895adf 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -776,7 +776,7

[PATCH 00/21] np/pack-v4 updates

This contains fixups for some of my patches, some of Nico's, adds v4 support to unpack-objects because the test suite needs it. With these, when force generating pack v4 unconditionally, the remaining failed tests are: - t5300-pack-object: ofs-delta tests fail (not surprising). core.packsizeli

[PATCH 06/21] pack v4: lift dict size check in load_dict()

A pack with no trees (or an empty pack) could have zero-sized name dictionary. Signed-off-by: Nguyễn Thái Ngọc Duy --- packv4-parse.c | 4 1 file changed, 4 deletions(-) diff --git a/packv4-parse.c b/packv4-parse.c index f96acc1..80ad6fc 100644 --- a/packv4-parse.c +++ b/packv4-parse.c @@

[PATCH 01/21] fixup! pack-objects: prepare SHA-1 table in v4

Signed-off-by: Nguyễn Thái Ngọc Duy --- remove debugging code builtin/pack-objects.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 1efb728..945b817 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -816,7 +816,6 @@ st

Re: [PATCH 1/2] reset: handle submodule with trailing slash

Am 10.09.2013 21:13, schrieb John Keeping: > When using tab-completion, a directory path will often end with a > trailing slash which currently confuses "git rm" when dealing with > submodules. Now that we have parse_pathspec we can easily handle this > by simply adding the PATHSPEC_STRIP_SUBMODUL

Re: Regression in e02ca72: git svn rebase is broken on Windows

Am 11.09.2013 05:19, schrieb Jiang Xin: > I tested 'relative_path' function using 'test-path-utils', and got the > following result: > > $ ./test-path-utils relative_path 'C:/a/b' 'D:/x/y' > ../../../C:/a/b > > $ ./test-path-utils relative_path '/a/b' 'x/y' > ../..//a/b > > $

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013/9/11 Karsten Blees : > Junio C Hamano pobox.com> writes: > >> The suspect commit and symptom look consistent. You started from a >> directory whose absolute path is "w:/work/..." and the updated code >> mistakenly thoguht that something that begins with "w" (not '/') is >> not an absolute, s

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013/9/11 Junio C Hamano : > Tvangeste writes: > >> Hi, >> >> After bisecting this problem I ended up with the mentioned commit that >> completely breaks git-svn for me on Windows (mingw/msys version). >> >> == >> #> git svn rebase >> warning: unable to access '': Invalid argument >> warn

[PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command

>From a33659535cb0eac92bed42d5e494dbb8f5d9ab20 Mon Sep 17 00:00:00 2001 From: Benjamin Bergman Date: Tue, 10 Sep 2013 16:00:29 -0500 Subject: [PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command Detailed description of `--detach` states that it is default for `

Re: [PATCH] http-backend: provide Allow header for 405

On Sun, Sep 08, 2013 at 09:18:12PM -0700, Jonathan Nieder wrote: > > --- a/http-backend.c > > +++ b/http-backend.c > > @@ -594,8 +594,11 @@ int main(int argc, char **argv) > > > > if (strcmp(method, c->method)) { > > const char *proto = getenv("SERV

Re: push.default=upstream doesn't play nicely with remote.pushdefault/branch.*.pushremote

On Tue, Sep 10, 2013 at 8:10 AM, Ximin Luo wrote: > (Please CC me as I am not subscribed.) No need to say that, Git mailing list is sane and doesn't do reply-to munging. > The question here then is, what remote branch should git push to - since > pushremote only specifies a repo? I can suggest

Re: [PATCH 3/3] MSVC: fix stat definition hell

On Tue, Sep 10, 2013 at 7:23 PM, Karsten Blees wrote: > In msvc.h, there's a couple of stat related functions defined diffently s/diffently/differently/ > from mingw.h. When we remove these definitions, the only problem we get is > "warning C4005: '_stati64' : macro redefinition" for this line i

Re: [PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

On 9/10/13 4:20 PM, "Junio C Hamano" wrote: >Lee Carver writes: > >> As noted in several forums, a recommended way to move trees between >> repositories >> is to use git-filter-branch to revise the history for a single tree: >> >> >>http://gbayer.com/development/moving-files-from-one-git-repo

Hello

Hello, You have won 1,000.000 great british pounds in the ongoing promo draw. For claims, contact Mr Jeremy via email on: jeremy-off...@qq.com Thanks, T. Stratford. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majord

[PATCH/RFC 5/5] diffcore-rename.c: use new hash map implementation

Signed-off-by: Karsten Blees --- diffcore-rename.c | 48 +--- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 82b7975..6271af9 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -4,7 +4,

[PATCH/RFC 4/5] diffcore-rename.c: simplify finding exact renames

The find_exact_renames function currently only uses the hash table for grouping, i.e.: 1. add sources 2. add destinations 3. iterate all buckets, per bucket: 4. split sources from destinations 5. iterate destinations, per destination: 6. iterate sources to find best match This can be simplified b

[PATCH/RFC 3/5] diffcore-rename.c: move code around to prepare for the next patch

No actual code changes, just move hash_filespec up and outdent part of find_identical_files. Signed-off-by: Karsten Blees --- diffcore-rename.c | 98 +++ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/diffcore-rename.c b/diffco

[PATCH/RFC 2/5] buitin/describe.c: use new hash map implementation

Signed-off-by: Karsten Blees --- builtin/describe.c | 53 - 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index 7d73722..bbc7159 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @

[PATCH/RFC 1/5] add a hashtable implementation that supports O(1) removal

The existing hashtable implementation (in hash.[ch]) uses open addressing (i.e. resolve hash collisions by distributing entries across the table). Thus, removal is difficult to implement with less than O(n) complexity. Resolving collisions of entries with identical hashes (e.g. via chaining) is lef

[PATCH/RFC 0/5] New hash table implementation

Also here: https://github.com/kblees/git/tree/kb/hashmap Hi, this is a spin-off of my (very slowly progressing) msysgit fscache project. I needed to remove things from the hash table, which cannot be implemented efficiently in hash.[ch]. So I wrote hasmap.[ch], with these features: - O(1) remo

[PATCH 3/3] MSVC: fix stat definition hell

In msvc.h, there's a couple of stat related functions defined diffently from mingw.h. When we remove these definitions, the only problem we get is "warning C4005: '_stati64' : macro redefinition" for this line in mingw.h: #define _stati64(x,y) mingw_stat(x,y) The reason is that as of MSVCR80.dll

[PATCH 2/3] MSVC: fix compile errors due to macro redefinitions

Skip errno.h definitions if they are already defined. Signed-off-by: Karsten Blees --- compat/mingw.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index bd0a88b..6b531e4 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -32,7 +32,9 @@ typedef int so

[PATCH 1/3] MSVC: fix compile errors due to missing libintl.h

Set NO_GETTEXT in config.mak.uname to get rid of libintl.h dependency. Signed-off-by: Karsten Blees --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config.mak.uname index b27f51d..64b7f49 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -340,6 +

[PATCH 0/3] Fix MSVC compile errors and cleanup stat definitions

A few minor fixes for the MSVC build. Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions Karsten Blees (3): MSVC: fix compile errors due to missing libintl.h MSVC: fix compile errors due to macro redefinitions MSVC: fix stat definition hell compat/mingw.h | 21 ++

Re: [PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

Lee Carver writes: > As noted in several forums, a recommended way to move trees between > repositories > is to use git-filter-branch to revise the history for a single tree: > > http://gbayer.com/development/moving-files-from-one-git-repository-to-anoth > er-preserving-history/ > http://stackove

Re: [PATCH v6 7/8] update-ref: support multiple simultaneous updates

On Mon, Sep 9, 2013 at 8:57 PM, Brad King wrote: > diff --git a/Documentation/git-update-ref.txt > b/Documentation/git-update-ref.txt > index 0df13ff..0a0a551 100644 > --- a/Documentation/git-update-ref.txt > +++ b/Documentation/git-update-ref.txt > @@ -58,6 +58,58 @@ archive by creating a symlin

[PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

As noted in several forums, a recommended way to move trees between repositories is to use git-filter-branch to revise the history for a single tree: http://gbayer.com/development/moving-files-from-one-git-repository-to-anoth er-preserving-history/ http://stackoverflow.com/questions/1365541/how-to

Re: breakage in revision traversal with pathspec

On 10/09/2013 20:19, Junio C Hamano wrote: I am grumpy X-<. It appears that we introduced a large breakage during 1.8.4 cycle to the revision traversal machinery and made pathspec-limited "git log" pretty much useless. This command $ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl reports

Re: [PATCH v6 8/8] update-ref: add test cases covering --stdin signature

Eric Sunshine writes: > Thus printf provides all the functionality you require, and > print_nul() function can be dropped. So: > > printf '%s\0' foo bar baz > > is equivalent to: > > print_null foo bar baz Good eyes. Thanks, I missed them when I looked at the patches. -- To unsubscribe

Re: [PATCH v6 8/8] update-ref: add test cases covering --stdin signature

On Mon, Sep 9, 2013 at 8:57 PM, Brad King wrote: > Extend t/t1400-update-ref.sh to cover cases using the --stdin option. > > Signed-off-by: Brad King > --- > t/t1400-update-ref.sh | 639 > ++ > 1 file changed, 639 insertions(+) > > diff --git a/t/

Re: git-cvsserver strips exec bit

Michael Cronenworth writes: > Michael Cronenworth wrote: >> This fix is close. Now all files are checked out with a mask of 555. > > Let me clarify. > > Git mask 755 => CVS mask 555 > Git mask 644 => CVS mask 444 > > Thanks, > Michael Then what I wrote was actually relevant ;-) I am not sur

Re: [PULL REQUEST] initial pack v4 support

On Tue, 10 Sep 2013, Junio C Hamano wrote: > > packv4-parse.c: allow tree entry copying from a canonical tree object > > This one needed a small fix-up to make it compile. > > I do not particularly like reusing that "size" variable, but it > seemed to be dead at that point, so... > > pac

[PATCH] lookup_object: remove hashtable_index() and optimize hash_obj()

hashtable_index() appears to be a close duplicate of hash_obj(). Keep only the later and make it usable for all cases. Also remove the modulus as this is an expansive operation. The size argument is always a power of 2 anyway, so a simple mask operation provides the same result. On a 'git rev-li

Re: [PATCH v5 2/2] Add new @ shortcut for HEAD

Junio C Hamano writes: > Felipe Contreras writes: > >>> Hmph, is the above sufficient? I added a case that mimics Stefano's >>> original regression report (which is handled) and another that uses >>> doubled "@" for the same purpose of introducing a "funny" hierarchy, >>> and it appears that "c

Re: [PATCH 0/3] Reject non-ff pulls by default

Matthieu Moy writes: > Junio C Hamano writes: > >> You are in favor of an _option_ to allow people to forbid a pull in >> a non-ff situation, and I think other people are also in >> agreement. > > Yes. Having an option can't harm anybody, and there's a clear demand for > that. > >> So perhaps: >

Re: [PATCH v2] remote-bzr: reuse bzrlib transports when possible

Junio C Hamano writes: > Richard Hansen writes: > >> def do_export(parser): >> -global parsed_refs, dirname >> +global parsed_refs, dirname, transports > > As this has been acked by Felipe who knows the script the best, I'll > apply this directly to 'master'. > > These additions of "glo

Re: breakage in revision traversal with pathspec

Kevin Bracey writes: > On 10/09/2013 20:19, Junio C Hamano wrote: >> I am grumpy X-<. >> >> It appears that we introduced a large breakage during 1.8.4 cycle to >> the revision traversal machinery and made pathspec-limited "git log" >> pretty much useless. >> >> This command >> >> $ git log

Re: git-cvsserver strips exec bit

Michael Cronenworth wrote: This fix is close. Now all files are checked out with a mask of 555. Let me clarify. Git mask 755 => CVS mask 555 Git mask 644 => CVS mask 444 Thanks, Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vge

Re: [PULL REQUEST] initial pack v4 support

Nicolas Pitre writes: > On Tue, 10 Sep 2013, Junio C Hamano wrote: > >> Nicolas Pitre writes: >> >> > Junio, would you please pull the following into pu: >> > >> >git://git.linaro.org/people/nico/git >> > >> > This is the pack v4 work to date which is somewhat getting usable. It >> > is t

Re: Regression in e02ca72: git svn rebase is broken on Windows

Junio C Hamano pobox.com> writes: > > Tvangeste yandex.ru> writes: > > > Hi, > > > > After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on > Windows (mingw/msys version). > > > > == > > #> git svn rebase > > warning: unable to access

Re: git-cvsserver strips exec bit

Junio C Hamano wrote: I stopped interacting with CVS quite a long time ago, so I do not have any way of verifying, but the fix may be just the matter of something like this. This fix is close. Now all files are checked out with a mask of 555. -- To unsubscribe from this list: send the line "un

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

Felipe Contreras writes: > Also 'branch..rebase' to 'branch..pullmode'. > > This way 'pull.mode' can be set to 'merge', and the default can be > something else. > > The old configurations still work, but get deprecated. Sounds good, but we should still mention these old names in the documentatio

Re: [PULL REQUEST] initial pack v4 support

On Tue, 10 Sep 2013, Junio C Hamano wrote: > Nicolas Pitre writes: > > > Junio, would you please pull the following into pu: > > > > git://git.linaro.org/people/nico/git > > > > This is the pack v4 work to date which is somewhat getting usable. It > > is time it gets more exposure, and pos

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

On Tue, Sep 10, 2013 at 11:04 PM, Matthieu Moy wrote: > Chris Packham writes: > >> On 10/09/13 21:19, Matthieu Moy wrote: >>> Hi, >>> >>> I just noticed that the template COMMIT_EDITMSG was containing status >>> hints, and that they were not particularty helpfull _during_ a commit. I >>> think it

Re: [PULL REQUEST] initial pack v4 support

Nicolas Pitre writes: > Junio, would you please pull the following into pu: > > git://git.linaro.org/people/nico/git > > This is the pack v4 work to date which is somewhat getting usable. It > is time it gets more exposure, and possibly some more people's attention > who would like to wo

Re: pack v4 trees with a canonical base

On Tue, 10 Sep 2013, Junio C Hamano wrote: > Nicolas Pitre writes: > > > On Tue, 10 Sep 2013, Junio C Hamano wrote: > > > >> There may be trees in the wild that record 100775 or 100777 in the > >> mode field for executable blobs, which also need to be special > >> cased. > > > > All the file mod

Re: pack v4 trees with a canonical base

Nicolas Pitre writes: very much appreciated to> On Tue, 10 Sep 2013, Junio C Hamano wrote: > >> Duy Nguyen writes: >> >> > On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre wrote: >> >> An eventual optimization to index-pack when completing a pack would be >> >> to attempt the encoding of appende

Re: Regression in e02ca72: git svn rebase is broken on Windows

10.09.2013, 20:02, "Johannes Schindelin" : >  Given the explanation what msysGit is, you might suspect that I'd like you >  to try to fix this in the msysGit context: After installing > >  https://code.google.com/p/msysgit/downloads/list?q=net+installer No problem. Here's what I have so fa

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

On Tue, Sep 10, 2013 at 5:59 PM, Junio C Hamano wrote: > string to that file before building, so in that sense, we do not > *need* DEF_VER and version. But they have been there for a long > time, and I do not think it gives us a good trade-off between > risking regression and reducing the lineco

Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates

Brad King writes: > On 09/10/2013 12:30 PM, Junio C Hamano wrote: >> Thanks. I am not sure if I should rewind and rebuild the series >> with these patches, though. This is a new feature and does not have >> to be merged to 'maint', so rebasing is perfectly fine, but it is >> not strictly necess

Re: pack v4 trees with a canonical base

On Tue, 10 Sep 2013, Junio C Hamano wrote: > Duy Nguyen writes: > > > On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre wrote: > >> An eventual optimization to index-pack when completing a pack would be > >> to attempt the encoding of appended tree objects into the packv4 format > >> using the exi

Re: [PATCH 1/2] reset: handle submodule with trailing slash

On Tue, Sep 10, 2013 at 09:37:45PM +0200, Jens Lehmann wrote: > Am 10.09.2013 21:13, schrieb John Keeping: > > When using tab-completion, a directory path will often end with a > > trailing slash which currently confuses "git rm" when dealing with > > I think you meant to say "git reset" in the li

Re: [PATCH 1/2] reset: handle submodule with trailing slash

Am 10.09.2013 21:13, schrieb John Keeping: > When using tab-completion, a directory path will often end with a > trailing slash which currently confuses "git rm" when dealing with I think you meant to say "git reset" in the line above. Apart from that I'm all for it. > submodules. Now that we ha

Re: git-cvsserver strips exec bit

Junio C Hamano writes: > Michael Cronenworth writes: > >> On git 1.8.1.x (Fedora 18) I was able to use the git-cvsserver to checkout >> code >> to package into a tarball. Script files that were in git with 755 masks were >> checked-out with the same mask. After upgrading the git repository mach

Re: pack v4 trees with a canonical base

Duy Nguyen writes: > On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre wrote: >> An eventual optimization to index-pack when completing a pack would be >> to attempt the encoding of appended tree objects into the packv4 format >> using the existing dictionary table in the pack, and fall back to the

Re: What's cooking in git.git (Sep 2013, #02; Mon, 9)

Jens Lehmann writes: > Am 10.09.2013 00:53, schrieb Junio C Hamano: >> * bc/submodule-status-ignored (2013-09-04) 2 commits >> - submodule: don't print status output with ignore=all >> - submodule: fix confusing variable name >> >> Originally merged to 'next' on 2013-08-22 >> >> Will merge

[PATCH 2/2] rm: re-use parse_pathspec's trailing-slash removal

Instead of re-implementing the "remove trailing slashes" loop in builtin/rm.c just pass PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to parse_pathspec. Signed-off-by: John Keeping --- builtin/rm.c | 20 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/builtin/rm.c b/bu

[PATCH 0/2] reset: handle submodule with trailing slash

The first patch is the important one here, the second one I noticed while checking if any other commands fail to handle submodule paths with a trailing slash and is just a simplification. John Keeping (2): reset: handle submodule with trailing slash rm: re-use parse_pathspec's trailing-slash r

[PATCH 1/2] reset: handle submodule with trailing slash

When using tab-completion, a directory path will often end with a trailing slash which currently confuses "git rm" when dealing with submodules. Now that we have parse_pathspec we can easily handle this by simply adding the PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP flag. Signed-off-by: John Keeping -

Re: What's cooking in git.git (Sep 2013, #02; Mon, 9)

Matthieu Moy writes: > Junio C Hamano writes: > >> * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit >> - rebase: fix run_specific_rebase's use of "return" on FreeBSD >> >> Work around a bug in FreeBSD shell that caused a regression to "git >> rebase" in v1.8.4. It would be lovely to hea

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

Matthieu Moy wrote: > I just noticed that the template COMMIT_EDITMSG was containing status > hints, and that they were not particularty helpfull _during_ a commit. I > think it would be sensible to ignore advice.statusHints and disable > hints unconditionally when writting to COMMIT_EDITMSG. > >

Re: Regression in e02ca72: git svn rebase is broken on Windows

Hi Tvangeste, On Tue, 10 Sep 2013, Tvangeste wrote: > 10.09.2013, 18:13, "Johannes Schindelin" : > > Have you tried with Git for Windows yet? > > What's Git for Windows? If you mean msysgit, Actually, they are two different things: Git for Windows is what the name says, and it comes with an ins

Re: Regression in e02ca72: git svn rebase is broken on Windows

10.09.2013, 18:13, "Johannes Schindelin" : > Have you tried with Git for Windows yet? What's Git for Windows? If you mean msysgit, then I say no, because the latest msysgit version is from June 02, and the change under discussion was made later on, on June 25th. So, this regression is not in msy

Re: Re-Transmission of blobs?

Josef Wolf writes: > as we all know, files are identified by their SHA. Thus I had the impression > that when transfering files, git would know by the SHA whether a given file is > already available in the destination repository and the transfer would be of > no use. That is unfortunately not ho

Re: Regression in e02ca72: git svn rebase is broken on Windows

10.09.2013, 18:53, "Johannes Sixt" : > Can you please run the command with GIT_TRACE=2? Sure: #> git --version trace: built-in: git 'version' git version 1.8.4.242.gbb80ee0 #> git svn rebase -l trace: exec: 'git-svn' 'rebase' '-l' trace: run_command: 'git-svn' 'rebase' '-l' trace: built-in: git '

[PATCH 01/14] Document the HTTP transport protocol

From: "Shawn O. Pearce" Signed-off-by: Shawn O. Pearce Signed-off-by: Tay Ray Chuan -- This is the original <1255065768-10428-2-git-send-email-spea...@spearce.org> with some minor changes, as follows: - fix mis-spelling 'paramterized' - fix mis-spelling 'mangement' (spotted by Junio) -

[PATCH 04/14] normalize rules with RFC 5234

Drop LF, SP which are defined in RFC 5234. Replace HT with HTAB (also defined in the RFC). Use '/' instead of '|', as the RFC does. Signed-off-by: Tay Ray Chuan --- Documentation/technical/http-protocol.txt | 26 +- 1 file changed, 9 insertions(+), 17 deletions(-) diff

Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates

On 09/10/2013 12:30 PM, Junio C Hamano wrote: > Thanks. I am not sure if I should rewind and rebuild the series > with these patches, though. This is a new feature and does not have > to be merged to 'maint', so rebasing is perfectly fine, but it is > not strictly necessary, either. I just thoug

Re: Regression in e02ca72: git svn rebase is broken on Windows

Tvangeste writes: > Hi, > > After bisecting this problem I ended up with the mentioned commit that > completely breaks git-svn for me on Windows (mingw/msys version). > > == > #> git svn rebase > warning: unable to access '': Invalid argument > warning: unable to access '': Invalid argum

[PATCH 06/14] reword behaviour on missing repository or objects

From: "Shawn O. Pearce" Signed-off-by: Tay Ray Chuan -- To Shawn: sign-off-by needed. Based on: From: "Shawn O. Pearce" Message-ID: <20091016142135.gr10...@spearce.org> Mike Hommey wrote: > On Thu, Oct 15, 2009 at 10:59:25PM -0700, H. Peter Anvin wrote: > > On 10/10/2009 03:12 AM,

[PATCH 00/14] document edits to original http protocol documentation

This patch series are the changes based on the discussion on Shawn's original text [1]. Some of them are minor, while some may potentially change behaviour; see below for a classification of the changes. Hopefully they can be examined by the git contributors here. An earlier iteration of this patc

Re: git-cvsserver strips exec bit

Michael Cronenworth writes: > On git 1.8.1.x (Fedora 18) I was able to use the git-cvsserver to checkout > code > to package into a tarball. Script files that were in git with 755 masks were > checked-out with the same mask. After upgrading the git repository machine to > Fedora 19 (1.8.3.1) the

Re: Regression in e02ca72: git svn rebase is broken on Windows

Am 10.09.2013 15:14, schrieb Tvangeste: > After bisecting this problem I ended up with the mentioned commit > that completely breaks git-svn for me on Windows (mingw/msys version). > > == > #> git svn rebase > warning: unable to access '': Invalid argument > warning: unable to access '': I

[PATCH 03/14] capitalize key words according to RFC 2119

Signed-off-by: Tay Ray Chuan --- Documentation/technical/http-protocol.txt | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt index 70a1648..55753bb 100644 --- a/Documentatio

[PATCH 09/14] reduce ambiguity over '?' in $GIT_URL for dumb clients

From: Junio C Hamano It is unclear if '?' can be part of $GIT_URL. E.g. $ wget http://example.xz/serve.cgi?path=git.git/info/refs $ git clone http://example.xz/serve.cgi?path=git.git Signed-off-by: Tay Ray Chuan -- Notes: - said "request to" instead of Junio's "request against", for

[PATCH 14/14] mention effect of "allow-tip-sha1-in-want" capability on git-upload-pack

From: Nguyễn Thái Ngọc Duy Signed-off-by: Tay Ray Chuan Signed-off-by: Nguyễn Thái Ngọc Duy -- Subject crafted by Ray Chuan, Nguyễn's s-o-b lifted from <1377092713-25434-1-git-send-email-pclo...@gmail.com>. --- Documentation/technical/http-protocol.txt | 3 ++- 1 file changed, 2 insertions(+

[PATCH 07/14] weaken specification over cookies for authentication

From: "Shawn O. Pearce" Signed-off-by: Tay Ray Chuan -- To Shawn: sign-off-by needed. Based on the discussion in <20091009195035.ga15...@coredump.intra.peff.net>, <20091015165228.go10...@spearce.org> (patch), <20091015173902.ga22...@sigill.intra.peff.net> (agreement) From: "Shawn O. Pe

[PATCH 11/14] be clearer in place of 'remote repository' phrase

Based on: From: Junio C Hamano Message-ID: <7vskdss3ei@alter.siamese.dyndns.org> > +Smart Service git-upload-pack > +-- > +This service reads from the remote repository. The wording "remote repository" felt confusing. I know it is "from the repos

breakage in revision traversal with pathspec

I am grumpy X-<. It appears that we introduced a large breakage during 1.8.4 cycle to the revision traversal machinery and made pathspec-limited "git log" pretty much useless. This command $ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl reports that a merge 766f0f8ef7 (which did not touch

[PATCH 13/14] shift dumb server response details

Shift details like ABNF from the client section to server section. This is in line with the smart analogue. Signed-off-by: Tay Ray Chuan --- Documentation/technical/http-protocol.txt | 49 +++ 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/Documentati

[PATCH 10/14] fix example request/responses

Add LF for responses. For smart interactions, add pkt-line lengths and the flush-pkt () line. Drop the SP that followed NUL before capability list. Signed-off-by: Tay Ray Chuan --- Documentation/technical/http-protocol.txt | 35 --- 1 file changed, 18 insertions

[PATCH 08/14] mention different variations around $GIT_URL

Based on From: Alex Blewitt Message-ID: Shawn O. Pearce spearce.org> writes: > +URL Format > +-- > + > +URLs for Git repositories accessed by HTTP use the standard HTTP > +URL syntax documented by RFC 1738, so they are of the form: > + > + http://:/ > + > +Wit

  1   2   >