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

2013-09-11 Thread Johannes Sixt
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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
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).

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
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 pclo...@gmail.com --- 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 +++

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 @@

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 +++

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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)

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 ---

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 ---

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 +++

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 +++

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 ---

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 +++

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 ---

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
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 pclo...@gmail.com --- show-index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
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

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

2013-09-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- 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 +++

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: But at the same time, I feel that these redundant lines, especially the latter one, would give the users a stronger cue than just saying that bar is Untracked; do X to include reminds that bar will not be included if nothing is done. The one which

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Javier Domingo
IMHO, It is alright as it is. I have been using git for 4~ years now, and I still find very useful those lines. They are like a git status while committing, and it's the key to avoid accidental commits of objects or forgetting files in a commit. Between that and that the commit message can't be

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

2013-09-11 Thread Duy Nguyen
On Wed, Sep 11, 2013 at 2:13 AM, John Keeping j...@keeping.me.uk wrote: 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 j...@keeping.me.uk --- builtin/rm.c | 20

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Matthieu Moy
Javier Domingo javier...@gmail.com writes: IMHO, It is alright as it is. I have been using git for 4~ years now, and I still find very useful those lines. They are like a git status while committing, and it's the key to avoid accidental commits of objects or forgetting files in a commit.

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

2013-09-11 Thread John Keeping
On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt 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 submodules. Now that we have parse_pathspec we can

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

2013-09-11 Thread John Keeping
On Wed, Sep 11, 2013 at 02:48:51PM +0700, Duy Nguyen wrote: On Wed, Sep 11, 2013 at 2:13 AM, John Keeping j...@keeping.me.uk wrote: Instead of re-implementing the remove trailing slashes loop in builtin/rm.c just pass PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to parse_pathspec.

[PATCH 1/2] wt-status: turn advice_status_hints into a field of wt_status

2013-09-11 Thread Matthieu Moy
No behavior change in this patch, but this makes the display of status hints more flexible as they can be enabled or disabled for individual calls to commit.c:run_status(). Signed-off-by: Matthieu Moy matthieu@imag.fr --- builtin/commit.c | 10 -- wt-status.c | 38

[PATCH 2/2] commit: disable status hints when writing to COMMIT_EDITMSG

2013-09-11 Thread Matthieu Moy
This turns the template COMMIT_EDITMSG from e.g # [...] # Changes to be committed: # (use git reset HEAD file... to unstage) # # modified: builtin/commit.c # # Untracked files: # (use git add file... to include in what will be committed) # # t/foo # to #

Re: [PATCH 2/2] commit: disable status hints when writing to COMMIT_EDITMSG

2013-09-11 Thread Eric Sunshine
On Wed, Sep 11, 2013 at 5:08 AM, Matthieu Moy matthieu@imag.fr wrote: Most status hints were written to be accurate when running git status before running a commit. Many of them are not applicable when the commit has already been started, and should not be shown in COMMIT_EDITMSG. The most

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread John Szakmeister
On Wed, Sep 11, 2013 at 3:24 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Junio C Hamano gits...@pobox.com writes: But at the same time, I feel that these redundant lines, especially the latter one, would give the users a stronger cue than just saying that bar is Untracked; do X to

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

2013-09-11 Thread Felipe Contreras
On Tue, Sep 10, 2013 at 3:26 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Felipe Contreras felipe.contre...@gmail.com writes: The problem is the newcomers, and the newcomers will most definitely not activate a configuration option to tell them that they are doing something potentially

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

2013-09-11 Thread Duy Nguyen
On Wed, Sep 11, 2013 at 3:20 PM, John Keeping j...@keeping.me.uk wrote: On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt 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

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

2013-09-11 Thread John Keeping
On Wed, Sep 11, 2013 at 05:54:48PM +0700, Duy Nguyen wrote: On Wed, Sep 11, 2013 at 3:20 PM, John Keeping j...@keeping.me.uk wrote: On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt wrote: Am 10.09.2013 21:13, schrieb John Keeping: When using tab-completion, a directory path will

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

2013-09-11 Thread Duy Nguyen
On Wed, Sep 11, 2013 at 6:08 PM, John Keeping j...@keeping.me.uk wrote: -- 8 -- diff --git a/builtin/reset.c b/builtin/reset.c index 9efac0f..800117f 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -143,7 +143,6 @@ static int read_from_tree(const struct pathspec *pathspec,

Re: Re-Transmission of blobs?

2013-09-11 Thread Josef Wolf
On Di, Sep 10, 2013 at 10:51:02 -0700, Junio C Hamano wrote: Consider this simple history with only a handful of commits (as usual, time flows from left to right): E / A---B---C---D where D is at the tip of the sending side, E is at the tip of the

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

2013-09-11 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Sep 10, 2013 at 3:26 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: So, you insist in asking the user to chose between rebase and merge, but you also insist that they will not chose rebase? So, why ask? Because as you said,

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

2013-09-11 Thread Brad King
On 09/10/2013 06:51 PM, Eric Sunshine wrote: On Mon, Sep 9, 2013 at 8:57 PM, Brad King brad.k...@kitware.com wrote: +Use 40 0 or the empty string to specify a zero value, except that Did you want an 's' after the 0? The same description without 's' already appears in git-update-ref.txt above

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

2013-09-11 Thread Brad King
Extend t/t1400-update-ref.sh to cover cases using the --stdin option. Signed-off-by: Brad King brad.k...@kitware.com --- On 09/10/2013 06:46 PM, Eric Sunshine wrote: Thus printf provides all the functionality you require, and print_nul() function can be dropped. So: printf '%s\0' foo

Re: git-cvsserver strips exec bit

2013-09-11 Thread Michael Cronenworth
Junio C Hamano wrote: Then what I wrote was actually relevant;-) I am not sure if we want to use the owner bit (i.e. 4th place) instead of the other bit (i.e. the last place) like this patch does, though. The old code in 1.8.1.x would have produced either r (for 100644) or

Re: Git tag output order is incorrect (IMHO)

2013-09-11 Thread Phil Hord
Someone at $work asked me this week how to find the current and previous tags on his branch so he could generate release notes. I just need last two tags on head in topo-order. I was surprised by how complicated this turned out to be. I ended up with this: git log --decorate=full

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Javier Domingo
That extra info doesn't occupy too much, and helps distinguish between sections. They do also remember you the commands to use (thought after some time using git, you may not need it). Cheers, Javier -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

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

2013-09-11 Thread Duy Nguyen
Nico, if you have time you may want to look into this. The result v4 pack from pack-objects on git.git for me is 35MB (one branch) while packv4-create produces 30MB (v2 is 40MB). I don't know why there is such a big difference in size. I compared. Ident dict is identical. Tree dict is a bit

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

2013-09-11 Thread Nicolas Pitre
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote: 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

[PATCH v2] configure.ac: move the private git m4 macros to a dedicated directory

2013-09-11 Thread Elia Pinto
Git use, as many project that use autoconf, private m4 macros. When not using automake, and just relying on autoconf, the macro files are not picked up by default. A possibility, as git do today, is to put the private m4 macro in the configure.ac file, so they will copied over the final

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

2013-09-11 Thread Junio C Hamano
Lee Carver lee.car...@servicenow.com writes: It is using the same ${tempdir} working directory that git rev-list uses below for the ../revs file Ah, I missed that; then that should be safe. The patch looks sane. Can we have your sign-off, too, please? It's normally .git-rewrite/t,

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

2013-09-11 Thread Eric Sunshine
On Wed, Sep 11, 2013 at 8:36 AM, Brad King brad.k...@kitware.com wrote: On 09/10/2013 06:51 PM, Eric Sunshine wrote: On Mon, Sep 9, 2013 at 8:57 PM, Brad King brad.k...@kitware.com wrote: +Use 40 0 or the empty string to specify a zero value, except that Did you want an 's' after the 0? The

[PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Sebastian Schuberth
This is necessary so that read_mailmap() can obtain a pointer to the function. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- git-compat-util.h | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index

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

2013-09-11 Thread Nicolas Pitre
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote: 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. Since I have a patch adding (partial) index v3 support to show-index in my tree, I've

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

2013-09-11 Thread Junio C Hamano
Karsten Blees karsten.bl...@gmail.com writes: 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

[PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
With MinGW runtime version 4.0 this interferes with the previous definition from sdkddkver.h. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- compat/nedmalloc/malloc.c.h | 2 ++ git-compat-util.h | 2 ++ 2 files changed, 4 insertions(+) diff --git

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

2013-09-11 Thread Sebastian Schuberth
On 11.09.2013 01:23, Karsten Blees wrote: 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)

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

2013-09-11 Thread Sebastian Schuberth
On Wed, Sep 11, 2013 at 6:09 PM, Junio C Hamano gits...@pobox.com wrote: Karsten Blees karsten.bl...@gmail.com writes: 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

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

2013-09-11 Thread Nicolas Pitre
On Wed, 11 Sep 2013, Duy Nguyen wrote: Nico, if you have time you may want to look into this. The result v4 pack from pack-objects on git.git for me is 35MB (one branch) while packv4-create produces 30MB (v2 is 40MB). I don't know why there is such a big difference in size. I compared. Ident

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

2013-09-11 Thread Nicolas Pitre
On Wed, 11 Sep 2013, Nguyễn Thái Ngọc Duy wrote: 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: [...] @junio: I've

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

2013-09-11 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: reset --soft does not go through these code paths (i.e. it does not need index at all). If we fail to load index index in reset --soft I think it's ok to die(). Corrupt index is fatal anyway. Do I smell a breakage here? Isn't reset --soft HEAD (or some

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: But at the same time, I feel that these redundant lines, especially the latter one, would give the users a stronger cue than just saying that bar is Untracked; do X to include reminds that bar will not

Re: Re-Transmission of blobs?

2013-09-11 Thread Junio C Hamano
Josef Wolf j...@raven.inka.de writes: On Di, Sep 10, 2013 at 10:51:02 -0700, Junio C Hamano wrote: Consider this simple history with only a handful of commits (as usual, time flows from left to right): E / A---B---C---D where D is at the tip of the

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

2013-09-11 Thread John Keeping
On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: reset --soft does not go through these code paths (i.e. it does not need index at all). If we fail to load index index in reset --soft I think it's ok to die(). Corrupt index is fatal

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

2013-09-11 Thread Junio C Hamano
Benjamin Bergman b...@benbergman.ca writes: From a33659535cb0eac92bed42d5e494dbb8f5d9ab20 Mon Sep 17 00:00:00 2001 From: Benjamin Bergman b...@benbergman.ca Date: Tue, 10 Sep 2013 16:00:29 -0500 Subject: [PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Kevin Bracey
On 11/09/2013 01:23, Junio C Hamano wrote: Kevin Bracey ke...@bracey.fi writes: On 10/09/2013 20:19, Junio C Hamano wrote: This command $ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl reports that a merge 766f0f8ef7 (which did not touch the specified path at all) touches it.

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-11 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: But at the same time, I feel that these redundant lines, especially the latter one, would give the users a stronger cue than just saying that bar is

Re: [PATCH v2] configure.ac: move the private git m4 macros to a dedicated directory

2013-09-11 Thread Stefano Lattarini
Hi Elia. Sorry, but I have to give my NAK to this patch. On 09/11/2013 04:46 PM, Elia Pinto wrote: Git use, as many project that use autoconf, private m4 macros. When not using automake, and just relying on autoconf, the macro files are not picked up by default. A possibility, as git do

Re: Git tag output order is incorrect (IMHO)

2013-09-11 Thread Junio C Hamano
Phil Hord phil.h...@gmail.com writes: Someone at $work asked me this week how to find the current and previous tags on his branch so he could generate release notes. I just need last two tags on head in topo-order. I was surprised by how complicated this turned out to be. I ended up with

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

2013-09-11 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: On Wed, Sep 11, 2013 at 6:09 PM, Junio C Hamano gits...@pobox.com wrote: Karsten Blees karsten.bl...@gmail.com writes: A few minor fixes for the MSVC build. Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions Karsten

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

2013-09-11 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: reset --soft does not go through these code paths (i.e. it does not need index at all). If we fail to load index index in reset --soft I think

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

2013-09-11 Thread John Keeping
On Wed, Sep 11, 2013 at 11:14:57AM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Sep 11, 2013 at 10:08:18AM -0700, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: reset --soft does not go through these code paths (i.e. it does not need

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Jonathan Nieder
Kevin Bracey wrote: On reflection I'm not sure what we should for the simple history view of v1.8.3.1..v1.8.4. We're not rewriting parents, so we don't get a chance to reconsider the merge as being zero-parent, and we do have this little section of graph to traverse at the bottom:

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: diff --git a/git-compat-util.h b/git-compat-util.h index 664305c..f5c756d 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -93,7 +93,9 @@ #undef __NO_INLINE__ #ifdef WIN32 /* Both MinGW and MSVC */ +#ifndef _WIN32_WINNT

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Jonathan Nieder
Sebastian Schuberth wrote: This is necessary so that read_mailmap() can obtain a pointer to the function. Hm, what platform has strcasecmp() as an inline function? Is this allowed by POSIX? Even if it isn't, should we perhaps just work around it by providing our own thin static function

Re: [PATCH 1/2] wt-status: turn advice_status_hints into a field of wt_status

2013-09-11 Thread Jeff King
On Wed, Sep 11, 2013 at 11:08:58AM +0200, Matthieu Moy wrote: No behavior change in this patch, but this makes the display of status hints more flexible as they can be enabled or disabled for individual calls to commit.c:run_status(). [...] +static void status_finalize(struct wt_status *s)

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: This is necessary so that read_mailmap() can obtain a pointer to the function. Whoa, I didn't think it is even legal for a C library to supply strcmp() or strcasecmp() that are purely inline you cannot take the address of. The solution looks a

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

2013-09-11 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -9,7 +9,8 @@ SYNOPSIS [verse] 'git checkout' [-q] [-f] [-m] [branch] -'git checkout' [-q] [-f] [-m] [--detach] [commit] +'git checkout' [-q] [-f] [-m] --detach [branch]

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

2013-09-11 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: However, I think we do do a read_cache when using reset --soft since we go through builtin/reset.c::die_if_unmerged_cache() which dies if read_cache fails. So I don't think we are losing anything by moving this check earlier. Thanks. -- To unsubscribe

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: I think you're right that dropping the don't follow off-graph treesame parents rule would be a sensible change. The usual point of the follow the treesame parent rule is to avoid drawing undue attention to merges of ancient history where some of the

[PATCH] Improve documentation concerning the status.submodulesummary setting

2013-09-11 Thread Jens Lehmann
'git status' and 'git commit' can be told to also show the output of git submodule summary by setting the status.submodulesummary config option. But status and commit also honor the diff.ignoreSubmodules and the submodule.name.ignore settings, which then disable the summary partly or completely.

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Jeff King
On Wed, Sep 11, 2013 at 11:29:21AM -0700, Jonathan Nieder wrote: Sebastian Schuberth wrote: This is necessary so that read_mailmap() can obtain a pointer to the function. Hm, what platform has strcasecmp() as an inline function? Is this allowed by POSIX? Even if it isn't, should we

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

2013-09-11 Thread Jeff King
On Tue, Sep 10, 2013 at 06:17:12PM -0400, Nicolas Pitre wrote: hashtable_index() appears to be a close duplicate of hash_obj(). Keep only the later and make it usable for all cases. Thanks. This duplication has often bugged me when looking at that hash table, but I just never actually wrote

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Sebastian Schuberth
On Wed, Sep 11, 2013 at 8:29 PM, Junio C Hamano gits...@pobox.com wrote: This unfortunately does not seem to match what I have. I think the patch is based on the codebase before these two: 380395d0 (mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE, 2013-05-02) 41f29991 (msvc: Fix

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Kevin Bracey
On 11/09/2013 21:24, Jonathan Nieder wrote: Kevin Bracey wrote: On reflection I'm not sure what we should for the simple history view of v1.8.3.1..v1.8.4. We're not rewriting parents, so we don't get a chance to reconsider the merge as being zero-parent, and we do have this little section of

Re: [PATCH] Improve documentation concerning the status.submodulesummary setting

2013-09-11 Thread Matthieu Moy
Jens Lehmann jens.lehm...@web.de writes: And here we go. Matthieu, does that make it more obvious? Seems OK. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Sebastian Schuberth
On Wed, Sep 11, 2013 at 8:29 PM, Jonathan Nieder jrnie...@gmail.com wrote: This is necessary so that read_mailmap() can obtain a pointer to the function. Hm, what platform has strcasecmp() as an inline function? Is this allowed by POSIX? Even if it isn't, should we perhaps just work

Re: [PATCH v2] configure.ac: move the private git m4 macros to a dedicated directory

2013-09-11 Thread Elia Pinto
2013/9/11 Stefano Lattarini stefano.lattar...@gmail.com: Hi Elia. Sorry, but I have to give my NAK to this patch. I hold in great consideration the comments of Stephen in this area. On 09/11/2013 04:46 PM, Elia Pinto wrote: Git use, as many project that use autoconf, private m4 macros.

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: To see the effect at the command line: git log v1.8.3..v.1.8.4 hides the merge, but git log ^v1.8.3 v1.8.4 shows it. Whoops. A new example of a dotty shorthand not being exactly equivalent. In the .. case the v1.8.3 tag gets peeled before being sent to

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

2013-09-11 Thread Stefan Beller
On 09/10/2013 12:53 AM, Junio C Hamano wrote: * sb/repack-in-c (2013-08-30) 2 commits - repack: retain the return value of pack-objects - repack: rewrite the shell script in C Any further reviews? Just came home from holiday (with no internet ;) but I'll review my code now that I have

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Jeff King
On Wed, Sep 11, 2013 at 09:59:53PM +0200, Sebastian Schuberth wrote: On Wed, Sep 11, 2013 at 8:29 PM, Jonathan Nieder jrnie...@gmail.com wrote: This is necessary so that read_mailmap() can obtain a pointer to the function. Hm, what platform has strcasecmp() as an inline function? Is

Re: [PATCH] Windows: Do not redefine _WIN32_WINNT

2013-09-11 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: On Wed, Sep 11, 2013 at 8:29 PM, Junio C Hamano gits...@pobox.com wrote: This unfortunately does not seem to match what I have. I think the patch is based on the codebase before these two: 380395d0 (mingw: rename WIN32 cpp macro to

Specifying a private key when connecting to a remote SSH repo

2013-09-11 Thread Breck Yunits
It would be very helpful if you could specify the path to the private key to use for ssh remotes just like in ssh. ``` git push origin master -i 'path_to_key' ``` Althought there are workarounds involving ssh config, if you have a server that has hundreds of git repos, each with the own private

What's cooking in git.git (Sep 2013, #03; Wed, 11)

2013-09-11 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'. The second batch of topics are now in 'master'. You can find the changes described here in the integration branches of the repositories listed

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

2013-09-11 Thread Junio C Hamano
Karsten Blees karsten.bl...@gmail.com writes: +#define FNV32_BASE ((unsigned int) 0x811c9dc5) +#define FNV32_PRIME ((unsigned int) 0x01000193) + ... +static inline unsigned int bucket(const hashmap *map, const hashmap_entry *key) +{ + return key-hash (map-tablesize - 1); +} As

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

2013-09-11 Thread brian m. carlson
The HTTP 1.1 standard requires an Allow header for 405 Method Not Allowed: The response MUST include an Allow header containing a list of valid methods for the requested resource. So provide such a header when we return a 405 to the user agent. Signed-off-by: brian m. carlson

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

2013-09-11 Thread Jonathan Nieder
brian m. carlson wrote: Signed-off-by: brian m. carlson sand...@crustytoothpaste.net Thanks again for noticing. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

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

2013-09-11 Thread Duy Nguyen
On Wed, Sep 11, 2013 at 11:25 PM, Nicolas Pitre n...@fluxnic.net wrote: On Wed, 11 Sep 2013, Duy Nguyen wrote: Nico, if you have time you may want to look into this. The result v4 pack from pack-objects on git.git for me is 35MB (one branch) while packv4-create produces 30MB (v2 is 40MB). I

[GIT PULL] updates of German translation for maint branch

2013-09-11 Thread Jiang Xin
Hi, Junio Would you please pull the following into maint branch. And it can be merged to the master branch. This isn't really a bugfix but a nice to have in a maintenance release. ($gmane/233807) The following changes since commit 21860882c8782771e99aa68fab6e365c628ff39d: l10n: fr.po: hotfix

RE: This is sequel to your non-response of my earlier letter to you

2013-09-11 Thread Barr Brenda Hoffman
Dear Friend After five years of waiting the crown (British government) has given me the power to contact you so that you become the beneficiary to total amount £15,000,000.00 GBP in the intent of the deceased who died without a will. I am contacting you because I believe you are related. Please

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

2013-09-11 Thread Junio C Hamano
Karsten Blees karsten.bl...@gmail.com writes: +/* + * Hashmap entry data structure, intended to be used as first member of user + * data structures. Consists of a pointer and an int. Ideally it should be It is technically correct to say this is intended to be used, but to those who are using

Re: [GIT PULL] updates of German translation for maint branch

2013-09-11 Thread Junio C Hamano
Thanks, will do. -- 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: Specifying a private key when connecting to a remote SSH repo

2013-09-11 Thread Junio C Hamano
Breck Yunits bre...@gmail.com writes: It would be very helpful if you could specify the path to the private key to use for ssh remotes just like in ssh. You could add a support for the remote.name.sshIdentityFile configuration variable, i.e. [remote origin] url =

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

2013-09-11 Thread Jeff King
On Thu, Sep 12, 2013 at 12:30:01AM +, brian m. carlson wrote: The HTTP 1.1 standard requires an Allow header for 405 Method Not Allowed: The response MUST include an Allow header containing a list of valid methods for the requested resource. So provide such a header when we return

Re: Specifying a private key when connecting to a remote SSH repo

2013-09-11 Thread Jeff King
On Wed, Sep 11, 2013 at 09:39:55PM -0700, Junio C Hamano wrote: If the only thing you are interested in supporting is a one-shot invocation, i.e. giving which identity file to use from the command line when you run either git push or git fetch, I suspect that you could play with GIT_SSH

  1   2   >