Re: [PATCH] t7406: fix i18n expectation of error message

Am 05.05.2017 um 19:50 schrieb Ævar Arnfjörð Bjarmason: On Fri, May 5, 2017 at 7:38 PM, Stefan Beller wrote: The error message from "submodule update" is internationalized, which makes sense. The test however did not check for the translated version, but used a hardcoded

Re: [PATCH 3/7] fixup! compat/regex: update the gawk regex engine from upstream

Am 05.05.2017 um 00:00 schrieb Ævar Arnfjörð Bjarmason: --- compat/regex/regcomp.c | 356 + 1 file changed, 209 insertions(+), 147 deletions(-) diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index d8bde06f1a..a1fb2e400e 100644 ---

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

Am 30.04.2017 um 09:53 schrieb René Scharfe: @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' "$GIT_UNZIP" -t many-big.zip ' -test_expect_success EXPENSIVE,UNZIP,ZIPINFO 'zip archive with files bigger than 4GB' ' +test_expect_success

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

Am 29.04.2017 um 02:15 schrieb Ramsay Jones: On 28/04/17 20:54, Johannes Sixt wrote: Am 28.04.2017 um 05:09 schrieb Junio C Hamano: Ramsay Jones <ram...@ramsayjones.plus.com> writes: Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule names", 07-04-20

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

Am 28.04.2017 um 05:09 schrieb Junio C Hamano: Ramsay Jones writes: Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule names", 07-04-2017) added a test which creates a git repository with some backslash characters in the name. This test cannot

Re: [PATCH 07/15] remote.c: report error on failure to fopen()

Am 27.04.2017 um 11:14 schrieb Duy Nguyen: On Thu, Apr 27, 2017 at 12:07 PM, Johannes Sixt <j...@kdbg.org> wrote: Am 27.04.2017 um 02:57 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: +++ git ls-remote 'refs*master' +warning: unable to access '.git/branches

Re: [PATCH 00/26] Address a couple of issues identified by Coverity

Am 26.04.2017 um 22:19 schrieb Johannes Schindelin: I recently registered the git-for-windows fork with Coverity to ensure that even the Windows-specific patches get some static analysis love. While at it, I squashed a couple of obvious issues in the part that is not Windows-specific. Thanks

Re: [PATCH 22/26] add_reflog_for_walk: avoid memory leak

Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: We free()d the `log` buffer when dwim_log() returned 1, but not when it returned a larger value (which meant that it still allocated the buffer but we simply ignored it). Identified by Coverity. Signed-off-by: Johannes Schindelin

Re: [PATCH 20/26] line-log: avoid memory leak

Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: Discovered by Coverity. Signed-off-by: Johannes Schindelin --- line-log.c | 1 + 1 file changed, 1 insertion(+) diff --git a/line-log.c b/line-log.c index a23b910471b..19d46e9ea2c 100644 --- a/line-log.c +++

Re: [PATCH 18/26] fast-export: avoid leaking memory in handle_tag()

Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: Reported by, you guessed it, Coverity. Signed-off-by: Johannes Schindelin --- builtin/fast-export.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

Re: [PATCH 14/26] setup_bare_git_dir(): fix memory leak

Am 26.04.2017 um 22:20 schrieb Johannes Schindelin: Reported by Coverity. Signed-off-by: Johannes Schindelin --- setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.c b/setup.c index 0309c278218..0320a9ad14c 100644 --- a/setup.c +++

Re: [PATCH 10/26] Check for EOF while parsing mails

Am 26.04.2017 um 22:20 schrieb Johannes Schindelin: Reported via Coverity. Signed-off-by: Johannes Schindelin --- builtin/mailsplit.c | 2 +- mailinfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/mailsplit.c

Re: [PATCH 06/26] get_mail_commit_oid(): avoid resource leak

Am 26.04.2017 um 22:19 schrieb Johannes Schindelin: When we fail to read, or parse, the file, we still want to close the file descriptor and release the strbuf. Reported via Coverity. Signed-off-by: Johannes Schindelin --- builtin/am.c | 11 ++- 1 file

Re: [PATCH 07/15] remote.c: report error on failure to fopen()

Am 27.04.2017 um 02:57 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: +++ git ls-remote 'refs*master' +warning: unable to access '.git/branches/refs*master': Invalid argument fatal: 'refs*master' does not appear to be a git repository fatal: Could not read from

Re: [PATCH 07/15] remote.c: report error on failure to fopen()

Am 20.04.2017 um 13:26 schrieb Nguyễn Thái Ngọc Duy: @@ -279,8 +283,12 @@ static void read_branches_file(struct remote *remote) struct strbuf buf = STRBUF_INIT; FILE *f = fopen(git_path("branches/%s", remote->name), "r"); - if (!f) + if (!f) { + if

Re: [PATCH v5 6/8] Introduce a new data type for timestamps

Am 24.04.2017 um 15:58 schrieb Johannes Schindelin: > diff --git a/archive-tar.c b/archive-tar.c > index 380e3aedd23..695339a2369 100644 > --- a/archive-tar.c > +++ b/archive-tar.c > @@ -27,9 +27,12 @@ static int write_tar_filter_archive(const struct archiver > *ar, > */ > #if ULONG_MAX ==

Re: [PATCH v5 8/8] Use uintmax_t for timestamps

Am 24.04.2017 um 15:58 schrieb Johannes Schindelin: > #define PRIo32 "o" > #endif > > -typedef unsigned long timestamp_t; > -#define PRItime "lu" > -#define parse_timestamp strtoul > +typedef uintmax_t timestamp_t; > +#define PRItime PRIuMAX > +#define parse_timestamp strtoumax > +#ifdef

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Am 25.04.2017 um 08:52 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: The idea of marking git-gui and gitk histories that none of their commits is checked out: it erases all Git source code from the working directory, and a later bisection step places all cod

Re: [PATCH v7 1/2] exec_cmd: expose is_executable function

Am 25.04.2017 um 19:54 schrieb Brandon Williams: Move the logic for 'is_executable()' from help.c to exec_cmd.c and expose it so that callers from outside help.c can access the function. The function is quite low-level. IMO, run-command.[ch] would be a better home for it. Additionally, that

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Am 25.04.2017 um 04:00 schrieb Christian Couder: On Sat, Apr 22, 2017 at 3:37 PM, Johannes Sixt <j...@kdbg.org> wrote: Am 21.04.2017 um 14:29 schrieb Christian Couder: First bisect should ask you to test merge bases only if there are "good" commits that are not ancestors of

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0x) { +zip64_dir_extra_payload_size +=

Re: [PATCH v7] read-cache: force_verify_index_checksum

Am 14.04.2017 um 22:32 schrieb g...@jeffhostetler.com: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 33a51c9..677e15a 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,4 +689,17 @@ test_expect_success 'bogus head does not fallback to all heads' ' ! grep $blob out '

Re: [PATCH v2] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 23.04.2017 um 16:51 schrieb Peter Krefting: Johannes Sixt: @@ -376,7 +397,7 @@ static int write_zip_entry(struct archiver_args *args, copy_le16(dirent.comment_length, 0); copy_le16(dirent.disk, 0); copy_le32(dirent.attr2, attr2); -copy_le32(dirent.offset, zip_offset

Re: [PATCH v2] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 23.04.2017 um 00:41 schrieb Peter Krefting: Indeed. Last time I implemented zip64 support it was on the reading side, and I remember this was a mess... It is indeed! static void set_zip_header_data_desc(struct zip_local_header *header, unsigned long

Re: [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 23.04.2017 um 08:42 schrieb Peter Krefting: René Scharfe: The offset is only needed in the ZIP64 extra record for the central header (in zip_dir) -- the local header has no offset field. Good point. The zip64 local header does have an offset field, though. I thought that was the

Re: [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 22.04.2017 um 21:22 schrieb Peter Krefting: @@ -279,6 +299,7 @@ static int write_zip_entry(struct archiver_args *args, int is_binary = -1; const char *path_without_prefix = path + args->baselen; unsigned int creator_version = 0; +int clamped = 0; crc = crc32(0, NULL,

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Am 21.04.2017 um 14:29 schrieb Christian Couder: First bisect should ask you to test merge bases only if there are "good" commits that are not ancestors of the "bad" commit. That's a tangent, but I have never understood why this needs to be so. Consider this: o--o--o--o--o--o--o--o--B

Re: [PATCH v3 05/12] refs: move submodule slash stripping code to get_submodule_ref_store

Am 20.04.2017 um 13:56 schrieb Duy Nguyen: On Thu, Apr 20, 2017 at 5:02 AM, Johannes Sixt <j...@kdbg.org> wrote: What is the source of the value of 'submodule'? Is it an index entry? Or did it pass through parse_pathspec? In these cases it is correct to compare against literal '/'. Oth

Re: [PATCH v3 05/12] refs: move submodule slash stripping code to get_submodule_ref_store

Am 19.04.2017 um 13:01 schrieb Nguyễn Thái Ngọc Duy: @@ -1558,7 +1543,17 @@ struct ref_store *get_submodule_ref_store(const char *submodule) { struct strbuf submodule_sb = STRBUF_INIT; struct ref_store *refs; + char *to_free = NULL; int ret; + size_t len; +

Re: [PATCH v5 02/11] t0061: run_command executes scripts without a #! line

Am 19.04.2017 um 17:56 schrieb Brandon Williams: On 04/19, Johannes Sixt wrote: Am 19.04.2017 um 07:43 schrieb Johannes Sixt: Windows can only run scripts with a shbang line. Out of curiosity how did you have t5550 passing on windows then? Since the first patch in this series fixes

Re: [PATCH v5 02/11] t0061: run_command executes scripts without a #! line

Am 19.04.2017 um 07:43 schrieb Johannes Sixt: Am 19.04.2017 um 01:17 schrieb Brandon Williams: Add a test to 't0061-run-command.sh' to ensure that run_command can continue to execute scripts which don't include a '#!' line. Why is this necessary? I am pretty certain that our emulation layer

Re: [PATCH v5 11/11] run-command: block signals between fork and execve

Am 19.04.2017 um 01:18 schrieb Brandon Williams: @@ -400,6 +404,53 @@ static char **prep_childenv(const char *const *deltaenv) } #endif Does this #endif in this hunk context belong to an #ifndef GIT_WINDOWS_NATIVE? If so, I wonder why these new functions are outside these brackets? An

Re: [PATCH v5 02/11] t0061: run_command executes scripts without a #! line

Am 19.04.2017 um 01:17 schrieb Brandon Williams: Add a test to 't0061-run-command.sh' to ensure that run_command can continue to execute scripts which don't include a '#!' line. Why is this necessary? I am pretty certain that our emulation layer on Windows can only run scripts with a shbang

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

Am 17.04.2017 um 06:05 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: This is about command line completion. We go a long way to avoid forking processes there. What is 10x faster on Linux despite of forking a process may not be so on Windows. Doesn't this depend on ho

Re: [PATCH v3 1/2] Fix nonnull errors reported by UBSAN with GCC 7.

Am 17.04.2017 um 03:49 schrieb Junio C Hamano: "Something or NULL" is a name we use for a function that returns something (under normal circumstances) or returns NULL. This wrapper is not about returning NULL at all, as far as I can see, and is misnamed. If it is about "avoid moving 0 bytes",

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

Cc Gábor, resent with working email (hopefully); please follow-up on this mail. Am 15.04.2017 um 00:33 schrieb Ævar Arnfjörð Bjarmason: On Sat, Apr 15, 2017 at 12:08 AM, Carlos Pita wrote: This is much faster (below 0.1s): __git_index_files () { local

Re: Git allow to unconditionaly remove files on other developer host

Am 15.04.2017 um 13:36 schrieb KES: That curious, but git allow to unconditionally delete files on other developer host when he do `git pull` How to reproduce: 1. File should be ignored: echo "somefile" >> .gitignore 2. Add this ignored file into repository git add -f somefile 3. Push

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

Cc Gábor. Am 15.04.2017 um 00:33 schrieb Ævar Arnfjörð Bjarmason: On Sat, Apr 15, 2017 at 12:08 AM, Carlos Pita wrote: This is much faster (below 0.1s): __git_index_files () { local dir="$(__gitdir)" root="${2-.}" file; if [ -d "$dir" ]; then

Re: [PATCH] t6500: don't run detached auto gc at the end of the test script

Am 10.04.2017 um 19:01 schrieb Jeff King: I wonder if you could make it a general test-lib function, like: run_and_wait () { # we read stdout from the child only for the side effect # of waiting until all child sub-processes exit, closing their # fd 9.

Re: [PATCH v3 1/2] Fix nonnull errors reported by UBSAN with GCC 7.

Am 06.04.2017 um 19:31 schrieb René Scharfe: Am 06.04.2017 um 18:33 schrieb Johannes Sixt: Am 06.04.2017 um 17:42 schrieb Martin Liška: +static inline void *sane_memmove(void *dest, const void *src, size_t n) +{ +if (n > 0) +return memmove(dest, src, n); +else +ret

Re: [PATCH v3 1/2] Fix nonnull errors reported by UBSAN with GCC 7.

Am 06.04.2017 um 17:42 schrieb Martin Liška: +static inline void *sane_memmove(void *dest, const void *src, size_t n) +{ + if (n > 0) + return memmove(dest, src, n); + else + return dest; +} Huh? memmove with n == 0 is well-defined. This wrapper is

Re: Is there a way to have a local version of a header file?

Am 19.03.2017 um 00:22 schrieb Samuel Lijin: I'd just provide a .sample and tell people what to do with it in the README. The alternative is to provide config.h as is and tell people to use "git update-index --assume-unchanged" immediately after cloning to ignore changes to the file, but this is

Re: [PATCH 03/10] pack-objects: test for --partial-by-size --partial-special

Am 08.03.2017 um 18:37 schrieb Jeff Hostetler: +test_expect_success 'setup' ' + perl -e "print \"a\" x 11;" > a && + perl -e "print \"a\" x 1100;"> b && + perl -e "print \"a\" x 110;" > c && If the file contents do not matter, you can have the same without perl

Re: [PATCH] t*: avoid using pipes

Am 07.03.2017 um 18:21 schrieb Stefan Beller: On Tue, Mar 7, 2017 at 8:10 AM, Prathamesh Chavan wrote: I'm Prathamesh Chavan. As a part of my micropraoject I have been working on "Avoid pipes for git related commands in test suites". Welcome to the Git community! * keep

Re: [PATCH] pull: do not segfault when HEAD refers to missing object file

Am 06.03.2017 um 04:51 schrieb Jeff King: On Sun, Mar 05, 2017 at 11:52:22PM +, brian m. carlson wrote: On Mon, Mar 06, 2017 at 12:42:22AM +0100, André Laszlo wrote: +test_expect_success 'git pull --rebase with corrupt HEAD does not segfault' ' + mkdir corrupted && + (cd

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 24.02.2017 um 22:54 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: I'll use the patch for daily work for a while to see whether it hurts. Please ping this thread again when you have something to add. For now, I'll demote this patch from 'next' to 'pu' when we

Re: [PATCH] submodule init: warn about falling back to a local path

Am 24.02.2017 um 01:17 schrieb Stefan Beller: --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -73,13 +73,17 @@ configuration entries unless `--name` is used to specify a logical name. ... +The default remote is the remote of the remote tracking branch +of the

Re: Git bisect does not find commit introducing the bug

Am 19.02.2017 um 12:32 schrieb Alex Hoffman: The assumption that there is no transition from bad to good in the graph did not hold in my example and it does not hold when a feature was recently introduced and gets broken relative shortly afterwards. Then you must adjust your definition of

Re: Git bisect does not find commit introducing the bug

Am 18.02.2017 um 19:36 schrieb Alex Hoffman: Let's consider your example with distinct names for nodes: --o1--o2--o3--G--X1 \\ x1--x2--x3--x4--X2--B-- It makes sense that git bisect is expecting a single transition, as this is a precondition for a binary search to

Re: Git bisect does not find commit introducing the bug

Am 18.02.2017 um 12:15 schrieb Alex Hoffman: No one commented the fact, that I find this very confusing. Don't you find this confusing? I will underline, that 'git bisect good v.good' will fail if the commit 'v.good' is not a parent of the bad commit, meaning there MUST be at least a path

Re: Git bisect does not find commit introducing the bug

Am 18.02.2017 um 00:21 schrieb Stephan Beyer: On 02/17/2017 11:29 PM, Alex Hoffman wrote: * 7a9e952 (bisect bad) |\ | * 671cec2 <--- expected | |\ | * | 04c6f4b <--- found * | | 3915157 |\ \ \ | | |/ | |/| | * | f4154e9 (bisect good) | * | 85855bf | |/ * | f1a36f5 |/ * 1b7fb88 The

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 13.02.2017 um 18:16 schrieb Johannes Schindelin: On Sat, 11 Feb 2017, Johannes Sixt wrote: Am 10.02.2017 um 00:41 schrieb Junio C Hamano: Johannes Schindelin <johannes.schinde...@gmx.de> writes: From: Jeff Hostetler <jeffh...@microsoft.com> Use OpenSSL's SHA-1 routines

Re: [PATCH] mingw: make stderr unbuffered again

Am 16.02.2017 um 18:10 schrieb Johannes Schindelin: On Wed, 15 Feb 2017, Johannes Sixt wrote: I do not see how dup2() causes a change in stdio state. I must be missing something (and that may be a basic misunderstanding of how stdio is initialized). It appears that dup2()ing fd 2 resets

Re: [PATCH] mingw: make stderr unbuffered again

Am 15.02.2017 um 13:32 schrieb Johannes Schindelin: On Tue, 14 Feb 2017, Johannes Sixt wrote: Am 14.02.2017 um 15:47 schrieb Johannes Schindelin: On Mon, 13 Feb 2017, Junio C Hamano wrote: Johannes Schindelin <johannes.schinde...@gmx.de> writes: What we forgot was to mark

Re: [PATCH] mingw: make stderr unbuffered again

Am 14.02.2017 um 15:47 schrieb Johannes Schindelin: On Mon, 13 Feb 2017, Junio C Hamano wrote: Johannes Schindelin writes: When removing the hack for isatty(), we actually removed more than just an isatty() hack: we removed the hack where internal data structures

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 13.02.2017 um 23:38 schrieb Johannes Schindelin: In addition, you build from a custom MINGW/MSys1 setup, correct? Correct. Specifically, I use the build tools from "msysgit" times, but build outside the premanufactured build environement; i.e., the "THIS_IS_MSYSGIT" section in

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 13.02.2017 um 20:42 schrieb Junio C Hamano: I have been operating under the assumption that everybody on Windows who builds Git works off of Dscho's Git for Windows tree, and patches that are specific to Windows from Dscho's are sent to me via the list only after they have been in Git for

Small regression on Windows

Please type this, preferably outside of any repo to avoid that it is changed; note the command typo: git -c help.autocorrect=40 ceckout Git waits for 4 seconds, but does not write anything until just before it exits. It bisects to a9b8a09c3c30886c79133da9f48ef9f98c21c3b2 is the first bad

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 10.02.2017 um 17:04 schrieb Jeff King: On Fri, Feb 10, 2017 at 04:49:02PM +0100, Johannes Schindelin wrote: I think this is only half the story. A heavy-sha1 workload is faster, which is good. But one of the original reasons to prefer blk-sha1 (at least on Linux) is that resolving

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

Am 10.02.2017 um 00:41 schrieb Junio C Hamano: Johannes Schindelin writes: From: Jeff Hostetler Use OpenSSL's SHA-1 routines rather than builtin block-sha1 routines. This improves performance on SHA1 operations on Intel processors. ...

Re: [PATCH v2 0/7] completion bash: add more options and commands

Am 06.02.2017 um 22:29 schrieb Junio C Hamano: cornelius.w...@tngtech.com writes: From: Cornelius Weig This is the re-roll of patch series <2017015724.19360-1-cornelius.w...@tngtech.com>. This patch series adds all long-options that are mentioned in the

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 17:01 schrieb Johannes Schindelin: On Sat, 28 Jan 2017, René Scharfe wrote: diff --git a/git-compat-util.h b/git-compat-util.h index 87237b092b..66cd466eea 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -527,6 +527,16 @@ static inline int ends_with(const char *str,

Re: [PATCH] git-bisect: allow running in a working tree subdirectory

Am 26.01.2017 um 19:30 schrieb marcandre.lur...@redhat.com: From: Marc-André Lureau It looks like it can do it. Signed-off-by: Marc-André Lureau --- git-bisect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-bisect.sh

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

Am 25.01.2017 um 23:01 schrieb Jeff King: +#pragma GCC diagnostic ignored "-Wformat-zero-length" Last time I used #pragma GCC in a cross-platform project, it triggered an "unknown pragma" warning for MSVC. (It was the C++ compiler, I don't know if the C compiler would also warn.) It would

Re: [PATCH 7/7] completion: recognize more long-options

If at all possible, please use your real email address as the From address. It is pointless to hide behind a fake address because as Git contributor you will have to reveal your identity anyway. Please study item (5) "Sign your work" in Documentation/SubmittingPatches and sign off your work.

Re: [PATCH] mingw: follow-up to "replace isatty() hack"

and obviously correct (FLW). I can offer a Reviewed-by: Johannes Sixt <j...@kdbg.org> but it will take a day or two until I can test the patch. -- Hannes

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

Am 17.01.2017 um 20:17 schrieb Junio C Hamano: So... can we move this forward? I have no objects anymore. -- Hannes

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

Am 16.01.2017 um 18:06 schrieb Johannes Schindelin: On Mon, 16 Jan 2017, Jeff King wrote: Hmm. I am not sure to what degree CRLFs are actually a problem here. Keep in mind these are error messages generated via error(), and so not processing arbitrary data. I can imagine that CRs might come

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

Am 16.01.2017 um 02:51 schrieb Junio C Hamano: * jk/vreport-sanitize (2017-01-11) 2 commits - vreport: sanitize ASCII control chars - Revert "vreportf: avoid intermediate buffer" An error message with an ASCII control character like '\r' in it can alter the message to hide its early part,

Re: [PATCH 5/5] describe: teach describe negative pattern matches

Am 13.01.2017 um 07:57 schrieb Jacob Keller: On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt <j...@kdbg.org> wrote: When you write git log --branches --exclude=origin/* --remotes --exclude=origin/* applies only to --remotes, but not to --branches. Well for describe I don't

Re: [PATCH 5/5] describe: teach describe negative pattern matches

Am 13.01.2017 um 01:59 schrieb Jacob Keller: I think that --exclude makes sense, but the current implementation does not differentiate ordering, since both are merely accumulated into string_lists and then matched together. I'm not sure how order would impact things here? In the current

Re: [PATCH 5/5] describe: teach describe negative pattern matches

Am 12.01.2017 um 01:17 schrieb Jacob Keller: From: Jacob Keller Teach git-describe the `--discard` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

Am 12.01.2017 um 06:51 schrieb Pat Pannuto: diff --git a/git-add--interactive.perl b/git-add--interactive.perl index cf6fc926a..6d7b6c35d 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl This change, and all others

Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

Am 10.01.2017 um 20:25 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: BTW, the --sq and eval business is not required here. At this point, $IFS = $'\n', so set -- $(git rev-parse --sq --prefix "$prefix" -- "$@") will do. (Except that

Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

Am 10.01.2017 um 00:29 schrieb Richard Hansen: The pathnames output by the 'git rerere remaining' command are relative to the top-level directory but the 'git diff --name-only' command expects its pathname arguments to be relative to the current working directory. Run cd_to_toplevel before

Re: [PATCH] Makefile: POSIX windres

Am 09.01.2017 um 09:09 schrieb Johannes Schindelin: Hi Junio, On Sun, 8 Jan 2017, Junio C Hamano wrote: Steven Penny writes: When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax is not supported.

Re: [PATCH v3 13/13] mergetool: fix running in subdir when rerere enabled

Am 09.01.2017 um 20:05 schrieb Junio C Hamano: Junio C Hamano writes: I wonder if it makes more sense to always move to toplevel upfront and consistently use path from the toplevel, perhaps like the patch s/the patch/the attached patch/ I meant. does. The first hunk is

Re: [PATCH 3/3] execv_dashed_external: wait for child on signal death

cess *process); void *clean_on_exit_handler_cbdata; }; Very nice write-up and an "obviously correct patch" (FLW). For the complete series: Acked-by: Johannes Sixt <j...@kdbg.org> What should we add to Documentation/technical/api-run-command.txt about the new flag? "

Re: Regression: Ctrl-c from the pager in an alias exits it

Am 06.01.2017 um 20:41 schrieb Jeff King: On Fri, Jan 06, 2017 at 03:39:59PM +0100, Johannes Sixt wrote: diff --git a/run-command.c b/run-command.c index ca905a9e80..db47c429b7 100644 --- a/run-command.c +++ b/run-command.c @@ -29,6 +29,8 @@ static int installed_child_cleanup_handler; static

Re: Regression: Ctrl-c from the pager in an alias exits it

Am 06.01.2017 um 08:32 schrieb Jeff King: On Fri, Jan 06, 2017 at 02:26:02AM -0500, Jeff King wrote: You'll notice that it actually calls wait() on the pager. That's due to a3da882120 (pager: do wait_for_pager on signal death, 2009-01-22), which IIRC was addressing a very similar problem. We

Re: [PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled

Am 06.01.2017 um 02:09 schrieb Richard Hansen: If rerere is enabled and no pathnames are given, run cd_to_toplevel before running 'git diff --name-only' so that 'git diff --name-only' sees the pathnames emitted by 'git rerere remaining'. Also run cd_to_toplevel before running 'git rerere

Re: [PATCH] don't use test_must_fail with grep

Am 01.01.2017 um 15:23 schrieb Luke Diamand: On 31 December 2016 at 11:44, Pranit Bauva wrote: diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 0fe231280..2384535a7 100755 --- a/t/t9813-git-p4-preserve-users.sh +++

Re: Rebasing multiple branches at once

Am 31.12.2016 um 09:14 schrieb Mike Hommey: Hi, I've had this kind of things to do more than once, and had to do it a lot today, so I figured it would be worth discussing whether git-rebase should be enhanced to support this, or if this should go in a separate tool or whatever. So here is what

Re: [PATCH v4 2/2] repack: die on incremental + write-bitmap-index

Am 28.12.2016 um 19:12 schrieb David Turner: +static const char incremental_bitmap_conflict_error[] = N_( +"Incremental repacks are incompatible with bitmap indexes. Use \n" The SP before LF could be removed. +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +);

Re: [PATCH] mingw: add a regression test for pushing to UNC paths

Am 23.12.2016 um 18:11 schrieb Johannes Schindelin: Let's make sure that it does not regress again, by introducing a test that uses so-called "administrative shares": disk volumes are automatically shared under certain circumstances, e.g. the C: drive is shared as \\localhost\c$. Clever!

Re: [PATCH v2 3/3] mingw: replace isatty() hack

Am 22.12.2016 um 22:37 schrieb Johannes Schindelin: Hi Hannes, On Thu, 22 Dec 2016, Johannes Sixt wrote: Am 22.12.2016 um 18:09 schrieb Johannes Schindelin: +static HANDLE swap_osfhnd(int fd, HANDLE new_handle) +{ + /* +* Create a copy of the original handle associated with fd

Re: [PATCH v2 3/3] mingw: replace isatty() hack

I've only one request for clarification below. Otherwise, the patch looks good. (lines removed by the patch trimmed) Am 22.12.2016 um 18:09 schrieb Johannes Schindelin: +static HANDLE swap_osfhnd(int fd, HANDLE new_handle) +{ + /* +* Create a copy of the original handle

Re: [PATCH 4/2] t5615-alternate-env: double-quotes in file names do not work on Windows

Am 22.12.2016 um 07:13 schrieb Johannes Sixt: Am 21.12.2016 um 23:42 schrieb Jeff King: Hmph. I explicitly avoided a colon in the filename so that it would run on MINGW. Is a double-quote also not allowed? It is not allowed; that was my conclusion. But now that you ask, I'll double-check

Re: [PATCH bw/realpath-wo-chdir] real_path: canonicalize directory separators in root parts

Am 22.12.2016 um 18:33 schrieb Brandon Williams: It took me a couple extra seconds to realize that offset_1st_component returns 0 with a relative path, which makes causes the call to get_root_part to essentially be a noop (ie nothing is resolved). Yeah, I am still unsure whether it is a good

Re: [PATCH 0/2] Really fix the isatty() problem on Windows

Am 21.12.2016 um 22:15 schrieb Johannes Sixt: Am 21.12.2016 um 18:53 schrieb Johannes Schindelin: The current patch series is based on `pu`, as that already has the winansi_get_osfhandle() fix. For ease of testing, I also have a branch based on master which you can pull via git pull https

Re: [PATCH 4/2] t5615-alternate-env: double-quotes in file names do not work on Windows

Am 21.12.2016 um 23:42 schrieb Jeff King: On Wed, Dec 21, 2016 at 10:33:43PM +0100, Johannes Sixt wrote: Protect a recently added test case with !MINGW. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- I don't remember why I did not notice this failure sooner. Perhaps I did, but th

Re: [PATCH bw/realpath-wo-chdir] real_path: canonicalize directory separators in root parts

Am 21.12.2016 um 23:33 schrieb Brandon Williams: On 12/21, Johannes Sixt wrote: +/* copies root part from remaining to resolved, canonicalizing it on the way */ +static void get_root_part(struct strbuf *resolved, struct strbuf *remaining) +{ + int offset = offset_1st_component(remaining

[PATCH bw/realpath-wo-chdir] real_path: canonicalize directory separators in root parts

because t1504-ceiling-dirs.sh caught a breakage in GIT_CEILING_DIRECTORIES handling on Windows. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- This introduces the second #ifdef GIT_WINDOWS_NATIVE in this file. It could be avoided if convert_slashes were defined as a do-nothing on

[PATCH 4/2] t5615-alternate-env: double-quotes in file names do not work on Windows

Protect a recently added test case with !MINGW. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- I don't remember why I did not notice this failure sooner. Perhaps I did, but then ran out of time to debug it... The patch should go on top of jk/quote-env-path-list-component. t

Re: [PATCH 0/2] Really fix the isatty() problem on Windows

Am 21.12.2016 um 18:53 schrieb Johannes Schindelin: The current patch series is based on `pu`, as that already has the winansi_get_osfhandle() fix. For ease of testing, I also have a branch based on master which you can pull via git pull https://github.com/dscho/git

Re: Allow "git shortlog" to group by committer information

Am 20.12.2016 um 19:52 schrieb Johannes Sixt: Am 20.12.2016 um 19:35 schrieb Junio C Hamano: test_expect_success 'shortlog --committer (internal)' ' +git checkout --orphan side && +git commit --allow-empty -m one && +git commit --allow-empty -m two && +

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 21:49 schrieb Stefan Beller: On Tue, Dec 20, 2016 at 12:12 PM, Johannes Sixt <j...@kdbg.org> wrote: I have to ask, though: Is it so much necessary to report the exact command line in an error message? Have a look at https://github.com/git/git/blob/master/submodule.c

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 20:23 schrieb Stefan Beller: In a reroll I'll drop this patch and instead introduce a function `char *get_child_command_line(struct child_process*);`, which a caller can call before calling finish_command and then use the resulting string to assemble an error message without

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 19:33 schrieb Johannes Sixt: Am 20.12.2016 um 00:28 schrieb Stefan Beller: +void run_command_or_die(struct child_process *cmd) +{ +if (finish_command(cmd)) +report_and_die(cmd, "run"); And here as well. Oh, and BTW, this one wraps only fini

Re: Allow "git shortlog" to group by committer information

Am 20.12.2016 um 19:35 schrieb Junio C Hamano: test_expect_success 'shortlog --committer (internal)' ' + git checkout --orphan side && + git commit --allow-empty -m one && + git commit --allow-empty -m two && + GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m

<    1   2   3   4   5   6   7   8   9   10   >