Von Dr. Michael Johnson

Lieber Freund, Wie geht es dir heute? Ich hoffe, fein, ich bin Dr. Michael Johnson von Harlesden, North West London, hier in England. Ich arbeite für NatWest Bank London (National Westminster Bank Plc.). Ich schreibe Ihnen aus meinem Büro, die von einer großen immensen Nutzen für beide von uns

[PATCH 3/4] completion: add some missing options to `git push`

Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 06211a6..9dcc222 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/comp

[PATCH 4/4] completion: complete `git push --force-with-lease=`

Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 22 +- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 9dcc222..ad0e75c 100644 --- a/contrib/completion

[PATCH 1/4] completion: add missing terminator in case statement

Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7a6e1d7..d0b2895 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/comp

[PATCH 2/4] completion: complete "unstuck" `git push --recurse-submodules`

Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 4 1 file changed, 4 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/complet

Re: [PATCH v11 0/4] git config cache & special querying api utilizing the cache

Tanay Abhra writes: > Hi, > > [PATCH V11]: very minor fixes. check [13] for discussion. Perfect, all my remarks have been taken into account, and I guess Junio's too. The whole series is now Reviewed-by: Matthieu Moy -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from thi

Re: [PATCH 2/4] completion: complete "unstuck" `git push --recurse-submodules`

Am 19.07.2014 11:45, schrieb John Keeping: > Since the argument to `--recurse-submodules` is mandatory, it does not > need to be stuck to the option with `=`. > > Signed-off-by: John Keeping > --- > contrib/completion/git-completion.bash | 4 > 1 file changed, 4 insertions(+) > > diff --gi

Re: [PATCH] fast-import: use hashcmp() for SHA1 hash comparison

Am 19.07.2014 01:57, schrieb Jeff King: > On Fri, Jul 18, 2014 at 09:14:05PM +0200, René Scharfe wrote: > >> If inlining is really better is another matter; I don't understand how >> 1a812f3a (hashcmp(): inline memcmp() by hand to optimize) could have made >> git gc 18% faster, as it claimed. I w

Re: [PATCH] Make locked paths absolute when current directory is changed

On Sat, Jul 19, 2014 at 12:47 AM, Junio C Hamano wrote: >> + abspath = absolute_path(lk->filename); >> + if (strlen(abspath) >= sizeof(lk->filename)) >> + warning("locked path %s is relative when current >> directory " >> + "

Re: [PATCH] abspath.c: use PATH_MAX in real_path_internal()

On Fri, Jul 18, 2014 at 10:08 PM, René Scharfe wrote: >> We could wrap this "get cwd, cd back" pattern as well. So "save_cwd" >> returns an opaque pointer, "go_back" takes the pointer, (f)chdir back >> and free the pointer if needed. On platforms that support fchdir, it >> can be used, else we fal

Re: [PATCH v7 25/31] prune: strategies for linked checkouts

On Sat, Jul 19, 2014 at 1:17 AM, Thomas Rast wrote: > I get this from t2026.2 under valgrind: > > ==21334== Conditional jump or move depends on uninitialised value(s) > ==21334==at 0x46D49B: prune_repos_dir (prune.c:182) > ==21334==by 0x46D8C0: cmd_prune (prune.c:252) > ==21334==

[PATCH] use xcalloc() to allocate zero-initialized memory

Use xcalloc() instead of xmalloc() followed by memset() to allocate and zero out memory because it's shorter and avoids duplicating the function parameters. Signed-off-by: Rene Scharfe --- builtin/clean.c | 3 +-- builtin/index-pack.c | 3 +-- compat/mingw.c | 3 +-- pathspec.c

[PATCH] add documentation for writing config files

Replace TODO introduced in commit 9c3c22 with documentation explaining Git config API functions for writing configuration files. Signed-off-by: Tanay Abhra --- Documentation/technical/api-config.txt | 31 ++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git

Re: [PATCH 2/4] completion: complete "unstuck" `git push --recurse-submodules`

On Sat, Jul 19, 2014 at 01:37:26PM +0200, Johannes Sixt wrote: > Am 19.07.2014 11:45, schrieb John Keeping: > > Since the argument to `--recurse-submodules` is mandatory, it does not > > need to be stuck to the option with `=`. > > > > Signed-off-by: John Keeping > > --- > > contrib/completion/g

[PATCH] use xmemdupz() to allocate copies of strings given by start and length

Use xmemdupz() to allocate the memory, copy the data and make sure to NUL-terminate the result, all in one step. The resulting code is shorter, doesn't contain the constants 1 and '\0', and avoids duplicating function parameters. For blame, the last copied byte (o->file.ptr[o->file.size]) is alwa

[PATCH v7 7/9] replace: add test for --graft with signed commit

Signed-off-by: Christian Couder --- t/t6050-replace.sh | 24 1 file changed, 24 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index f854dae..cebab63 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -7,6 +7,7 @@ test_description='Tests repl

[PATCH v7 4/9] Documentation: replace: add --graft option

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-replace.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 61461b9..491875e 100644 --- a/Documentation/git-replace.txt +++ b/Docume

[PATCH v7 3/9] replace: add test for --graft

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t6050-replace.sh | 45 - 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index fb07ad2..f854dae 100755 --- a/t/t6050-replace.sh ++

[PATCH v7 5/9] contrib: add convert-grafts-to-replace-refs.sh

This patch adds into contrib/ an example script to convert grafts from an existing grafts file into replace refs using the new --graft option of "git replace". While at it let's mention this new script in the "git replace" documentation for the --graft option. Signed-off-by: Christian Couder Sig

[PATCH v7 9/9] replace: add test for --graft with a mergetag

Signed-off-by: Christian Couder --- t/t6050-replace.sh | 22 ++ 1 file changed, 22 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index cebab63..4d5a25e 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -418,4 +418,26 @@ test_expect_success GPG '

[PATCH v7 8/9] replace: check mergetags when using --graft

When using --graft, with a mergetag in the original commit, we should check that the commit pointed to by the mergetag is still a parent of then new commit we create, otherwise the mergetag could be misleading. If the commit pointed to by the mergetag is no more a parent of the new commit, we coul

[PATCH v7 0/9] Add --graft option to git replace

Here is a small series to implement: git replace [-f] --graft [...] This patch series goes on top of the patch series that implements --edit. The changes since v6, thanks to Junio, are: - the patch that adds for_each_mergetag() is not part of the series any more; it is managed by Jun

[PATCH v7 2/9] replace: add --graft option

The usage string for this option is: git replace [-f] --graft [...] First we create a new commit that is the same as except that its parents are [...] Then we create a replace ref that replace with the commit we just created. With this new option, it should be straightforward to convert graf

[PATCH v7 1/9] replace: cleanup redirection style in tests

Signed-off-by: Christian Couder --- t/t6050-replace.sh | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 68b3cb2..fb07ad2 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@

[PATCH v7 6/9] replace: remove signature when using --graft

It could be misleading to keep a signature in a replacement commit, so let's remove it. Note that there should probably be a way to sign the replacement commit created when using --graft, but this can be dealt with in another commit or patch series. Signed-off-by: Christian Couder --- builtin/r

[PATCH] Fix contrib/subtree Makefile to patch #! line

From: Charles Bailey Signed-off-by: Charles Bailey --- The main Git Makefile does this, but not the contrib/subtree Makefile. SHELL_PATH should be respected if set (especially on Solaris where /bin/sh is very legacy). The sed command is a copy of one of the ones used for installing .sh files by

[PATCH 1/2] mergetool: don't require a work tree for --tool-help

From: Charles Bailey Signed-off-by: Charles Bailey --- You can call git difftool --tool-help outside of a work tree but not mergetool --tool-help but there's not real reason for this restriction and it can be easily relaxed by deferring the require_work_tree call until after the options have bee

[PATCH 2/2] difftool: don't assume that default sh is sane

From: Charles Bailey git-difftool used to create a command list script containing $( ... ) and explicitly call "sh -c" with this list. Instead, allow mergetool --tool-help to take a mode parameter and call mergetool directly to invoke the show_tool_help function. This mode parameter is intented

Re: [PATCH] fast-import: use hashcmp() for SHA1 hash comparison

On Sat, Jul 19, 2014 at 02:11:30PM +0200, René Scharfe wrote: > I'd say if a platform doesn't bother optimizing memcmp() then they > deserve the resulting performance. And it's probably not too bad a > penalty because such comparisons probably won't make up a significant > part of most application

Re: git_inetd_server: run git-http-backend using inetd

Torsten Bögershausen wrote: > Jonathan, (I'm good in searching, but bad in finding) > could you point out where the source code for the git package for > debian is ? > > I recently learned about mDNS, and will probably do some tests > and experiments later, and would like to test the lookup featur

Re: [PATCH 2/2] difftool: don't assume that default sh is sane

On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote: > From: Charles Bailey > > git-difftool used to create a command list script containing $( ... ) > and explicitly call "sh -c" with this list. > > Instead, allow mergetool --tool-help to take a mode parameter and call > mergetool di

Re: [PATCH] fast-import: use hashcmp() for SHA1 hash comparison

Am 19.07.2014 18:43, schrieb brian m. carlson: On Sat, Jul 19, 2014 at 02:11:30PM +0200, René Scharfe wrote: I'd say if a platform doesn't bother optimizing memcmp() then they deserve the resulting performance. And it's probably not too bad a penalty because such comparisons probably won't make

[PATCH v4 0/1] http: Add Accept-Language header if possible

Changes since v3: * Fix styles and syntax. (Thanks to Jeff King and Eric Sunshine) * Cache Accept-Language header. (Thanks to Jeff King) * Remove floating point numbers. (Thanks to Junio C Hamano) * Make the for-loop to get the value of the header simpler. * Add more comments. Yi EungJun (1): h

[PATCH v4 1/1] http: Add Accept-Language header if possible

From: Yi EungJun Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= -> "" LANGUAGE=ko:en -> "Accept-Language: ko, en; q=0.9, *; q=0.1" LANGUAGE=ko LANG=en_US.UTF-8 -> "Accept-Language: ko,

Re: [PATCH RFC v2 08/19] rebase -i: Root commits are replayed with an unnecessary option

Hi Junio, Junio C Hamano writes: > Fabian Ruch writes: >> It makes the next patch easier to understand because the finalising >> command line "git commit --allow-empty --amend --no-post-rewrite -n >> --no-edit" seems to be simply moved to the end of do_pick. Substituting >> --no-edit for -C there

Re: [PATCH 2/2] difftool: don't assume that default sh is sane

On Sat, Jul 19, 2014 at 06:21:32PM +0100, John Keeping wrote: > > What's the reason for forcing `--tool-help` to be the last option? > Wouldn't it be simpler to just change the top-level case statement to: > > --tool-help=*) > TOOL_MODE=${1#--tool-help=} > show_t

Re: [PATCH] add documentation for writing config files

minor nit. From: "Tanay Abhra" Replace TODO introduced in commit 9c3c22 with documentation explaining Git config API functions for writing configuration files. Signed-off-by: Tanay Abhra --- Documentation/technical/api-config.txt | 31 ++- 1 file changed, 30 insert

[PATCH] fixup! Win32: Unicode environment (outgoing)

compat/mingw.c needs to #include "cache.h" for ALLOC_GROW. Signed-off-by: Karsten Blees --- compat/mingw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/compat/mingw.c b/compat/mingw.c index bd45950..c725a3e 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -4,6 +4,7 @@ #include #incl

[PATCH] t0110/MinGW: skip tests that pass arbitrary bytes on the command line

On Windows, the command line is a Unicode string, it is not possible to pass arbitrary bytes to a program. Disable tests that try to do so. Signed-off-by: Karsten Blees --- t/t0110-urlmatch-normalization.sh | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/t/t0110-urlmat

Re: [PATCH] abspath.c: use PATH_MAX in real_path_internal()

Am 18.07.2014 13:32, schrieb René Scharfe: > Am 18.07.2014 01:03, schrieb Karsten Blees: >> Am 17.07.2014 19:05, schrieb René Scharfe: >>> Am 17.07.2014 14:45, schrieb Nguyễn Thái Ngọc Duy: >> [...] >>> "These routines have traditionally been used by programs to save the >>> name of a working direc

Re: [PATCH] abspath.c: use PATH_MAX in real_path_internal()

Am 18.07.2014 12:49, schrieb Duy Nguyen: > can be used, else we fall back to chdir. I think there are only four > places that follow this pattern, here, setup.c (.git discovery), git.c > (restore_env) and unix-socket.c. Enough call sites to make it worth > the effort? > real_path(): here we actua

[PATCH] Add failing test: "fsck survives inflate errors"

While inflate errors are obviously NOT GOOD, and should perhaps be fatal for most commands, git fsck is something of a special case because it is useful to have *it* report as many corrupt objects as possible in one run. Signed-off-by: Samuel Bronson --- t/t1450-fsck.sh | 17 + 1

Re: git_inetd_server: run git-http-backend using inetd

On 07/19/2014 07:06 PM, Jonathan Nieder wrote: Torsten Bögershausen wrote: Jonathan, (I'm good in searching, but bad in finding) could you point out where the source code for the git package for debian is ? I recently learned about mDNS, and will probably do some tests and experiments later, a