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

Am 20.12.2016 um 00:28 schrieb Stefan Beller: +static void report_and_die(struct child_process *cmd, const char *action) +{ + int i; + struct strbuf err = STRBUF_INIT; + if (cmd->git_cmd) + strbuf_addstr(, "git "); + for (i = 0; cmd->argv[i]; ) +

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

Am 16.12.2016 um 14:51 schrieb Jeff King: diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index ae08b57712..6c7c637481 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -190,4 +190,17 @@ test_expect_success 'shortlog with --output=' ' test_line_count = 3 shortlog '

Re: [PATCH] winansi_isatty(): fix when Git is used from CMD

Am 18.12.2016 um 16:37 schrieb Johannes Sixt: winansi.c is all about overriding MSVCRT's console handling. If we are connected to a console, then by the time isatty() is called (from outside the emulation layer), all handling of file descriptors 1 and 2 is already outside MSVCRT's control

Re: [PATCH] winansi_isatty(): fix when Git is used from CMD

Am 18.12.2016 um 16:26 schrieb Johannes Sixt: > The new isatty() override implemented by cbb3f3c9b197 (mingw: intercept > isatty() to handle /dev/null as Git expects it, 2016-12-11) does not > take into account that _get_osfhandle() returns the handle visible by > the C code, which

[PATCH] winansi_isatty(): fix when Git is used from CMD

andle. Use it. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- I was able to test the idea earlier than anticipated and it does work for me. compat/winansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/winansi.c b/compat/winansi.c index cb725fb02f..ba360be69b 100

Re: [PATCH 1/1] mingw: intercept isatty() to handle /dev/null as Git expects it

Am 16.12.2016 um 19:08 schrieb Junio C Hamano: Sorry for not having waited for you to chime in before agreeing to fast-track this one, and now this is in 'master'. No reason to be sorry, things happen... Dscho's request for fast-tracking was very reasonable, and the patch looked "obviously

Re: [PATCH 1/1] mingw: intercept isatty() to handle /dev/null as Git expects it

Am 11.12.2016 um 12:16 schrieb Johannes Schindelin: When Git's source code calls isatty(), it really asks whether the respective file descriptor is connected to an interactive terminal. Windows' _isatty() function, however, determines whether the file descriptor is associated with a character

[PATCH v2] fix pushing to //server/share/dir on Windows

care of this, see the implementation in compat/mingw.c::mingw_offset_1st_component(). Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Am 14.12.2016 um 18:30 schrieb Jeff King: > Would it be reasonable to > write: > > /* Copy initial part of absolute path, converting sep

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

Am 14.12.2016 um 14:06 schrieb Jeff King: On Wed, Dec 14, 2016 at 07:53:23AM -0500, Jeff King wrote: On Wed, Dec 14, 2016 at 09:34:20AM +0100, Johannes Sixt wrote: I wanted to see what it would look like if we make it the caller's responsibility to throw away stderr. The patch is below

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

Am 13.12.2016 um 16:32 schrieb Johannes Schindelin: > This will be needed to hide the output of `git commit` when the > sequencer handles an interactive rebase's script. > > Signed-off-by: Johannes Schindelin > --- > run-command.c | 23 +++ >

Re: [PATCH v2 00/34] Teach the sequencer to act as rebase -i's backend

Am 13.12.2016 um 16:29 schrieb Johannes Schindelin: base-commit: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2 Published-As: https://github.com/dscho/git/releases/tag/sequencer-i-v2 Fetch-It-Via: git fetch https://github.com/dscho/git sequencer-i-v2 Thank you so much! I would appreciate if you

[PATCH] fix pushing to //server/share/dir paths on Windows

the mix. In the context of 'git push' this cannot be verified, though, as there seems to be an independent bug that transforms the double '\\' to a single '\' on the way. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Another long-standing bug uncovered by the quarantine series. Dscho, it

[PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too

of the semicolon suppresses this translation; but the untranslated POSIX style path is useless for git.exe. Therefore, instead of $PWD pass the Windows style path that $(pwd) produces. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Am 12.12.2016 um 20:53 schrieb Jeff King: > Johannes, please le

Re: [PATCH 2/2] tmp-objdir: quote paths we add to alternates

Am 12.12.2016 um 20:53 schrieb Jeff King: Johannes, please let me know if I am wrong about skipping the test on !MINGW. Thanks for being considerate. The !MINGW prerequisite is required for the test as written. The appropriate check there would be ";" anyway, but I am not sure _that_ is

Re: [PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

Am 10.12.2016 um 04:21 schrieb David Aguilar: Signed-off-by: David Aguilar --- This patch builds upon da/mergetool-trust-exit-code mergetools/tortoisemerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge

Re: [BUG] Colon in remote urls

Am 09.12.2016 um 16:22 schrieb Jeff King: +const char *parse_alt_odb_entry(const char *string, int sep, + struct strbuf *out) +{ + const char *p; + int literal = 0; + + strbuf_reset(out); + + for (p = string; *p; p++) { + if

Re: [PATCH v2 3/4] real_path: create real_pathdup

Am 09.12.2016 um 00:58 schrieb Brandon Williams: +char *real_pathdup(const char *path) +{ + struct strbuf realpath = STRBUF_INIT; + char *retval = NULL; + + if(strbuf_realpath(, path, 0)) Style nit: blank after if is missing. -- Hannes

Re: [PATCH v2 1/4] real_path: resolve symlinks by hand

Am 09.12.2016 um 00:58 schrieb Brandon Williams: The current implementation of real_path uses chdir() in order to resolve symlinks. Unfortunately this isn't thread-safe as chdir() affects a process as a whole and not just an individual thread. Instead perform the symlink resolution by hand so

Re: [PATCH] real_path: make real_path thread-safe

Am 08.12.2016 um 08:55 schrieb Torsten Bögershausen: Some conversion may be done in mingw.c: https://github.com/github/git-msysgit/blob/master/compat/mingw.c So what I understand, '/' in Git are already converted into '\' if needed ? Only if needed, and there are not many places where this is

Re: [PATCH] real_path: make real_path thread-safe

Am 07.12.2016 um 23:29 schrieb Brandon Williams: Instead of assuming root is "/" I'll need to extract what root is from an absolute path. Aside from what root looks like, do most other path constructs behave similarly in unix and windows? (like ".." and "." as examples) Yes, .. and . work the

Re: [PATCH] real_path: make real_path thread-safe

Am 07.12.2016 um 01:10 schrieb Brandon Williams: This function should accept both absolute and relative paths, which means it should probably accept "C:\My Files". I wasn't thinking about windows 100% of the time while writing this so I'm hoping that a windows expert will point things like this

Re: git reset --hard should not irretrievably destroy new files

Am 03.12.2016 um 06:04 schrieb Julian de Bhal: If you `git add new_file; git reset --hard`, new_file is gone forever. AFAIC, this is a feature ;-) I occasionally use it to remove a file when I already have git-gui in front of me. Then it's often less convenient to type the path in a shell,

Re: [PATCH v6 5/6] grep: enable recurse-submodules to work on objects

Am 01.12.2016 um 02:28 schrieb Brandon Williams: + git init "su:b" && Don't do that. Colons in file names won't work on Windows. -- Hannes

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

Am 01.12.2016 um 00:40 schrieb Jeff King: 20813 access("su:b/../.git/modules/su:b/refs", X_OK) = 0 Side note: where does this weirdness "su:b" come from? (I haven't looked at any of the patches, yet, let alone tested.) Colons in file or directory names won't work on Windows (in the way one

Re: [PATCH v2 00/11] git worktree (re)move

Am 29.11.2016 um 14:56 schrieb Duy Nguyen: If you drop all the "copy.c: " patches and squash this to "worktree move: new command", and if Windows rename() can move directories, then git should build and new tests pass. Thanks! rename() can move directories on Windows, provided that *nothing*

Re: [PATCH v2 00/11] git worktree (re)move

Am 28.11.2016 um 21:20 schrieb Junio C Hamano: Junio C Hamano writes: Does this round address the issue raised in http://public-inbox.org/git/alpine.DEB.2.20.1611161041040.3746@virtualbox by Dscho? Even if you are not tracking a fifo, for example, your working tree may

Re: [ANNOUNCE] Git v2.11.0-rc3

Am 24.11.2016 um 17:25 schrieb Marc Branchaud: On 2016-11-23 06:21 PM, Junio C Hamano wrote: * The original command line syntax for "git merge", which was "git merge HEAD ...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is

Re: [PATCH] git-gui: pass the branch name to git merge

Am 23.11.2016 um 21:05 schrieb Junio C Hamano: > Johannes Sixt <j...@kdbg.org> writes: >> Am 22.11.2016 um 21:40 schrieb Johannes Sixt: >>> Am 22.11.2016 um 20:16 schrieb Junio C Hamano: >>>> Can't this be handled on the "git merge FETCH_HEAD" codepat

Re: [PATCH] git-gui: pass the branch name to git merge

Am 22.11.2016 um 21:40 schrieb Johannes Sixt: Am 22.11.2016 um 20:16 schrieb Junio C Hamano: Can't this be handled on the "git merge FETCH_HEAD" codepath instead? Absolutely. Any takers? ;) I attempted to fix git merge FETCH_HEAD, but I do not see a trivial solution. But

Re: [PATCH] git-gui: pass the branch name to git merge

Am 22.11.2016 um 20:16 schrieb Junio C Hamano: Can't this be handled on the "git merge FETCH_HEAD" codepath instead? Absolutely. Any takers? ;) -- Hannes

[PATCH] git-gui: pass the branch name to git merge

. A disadvantage of this method is, though, that the conflict markers are augmented with a raw SHA1 instead of a symbolic branch name. Revert to the former invocation style so that we get both a useful commit message and a symbolic name in the conflict markers. Signed-off-by: Johannes Sixt <j...@kdbg.

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

Am 21.11.2016 um 20:07 schrieb Junio C Hamano: Setting comment-char to multi-letter sequence is not supported at all, and this code is protecting itself from that nonsense---it does not need to be fast, and Dscho already gives a fast path for a single letter case in his patch. Fair enough, no

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

Am 21.11.2016 um 19:40 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: It could be written without forking a process: comment_char=${comment_char%${comment_char#?}} (aka "remove from the end what remains after removing the first character") Hopefu

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

Am 21.11.2016 um 15:18 schrieb Johannes Schindelin: -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) -: ${comment_char:=#} +comment_char=$(git config --get core.commentchar 2>/dev/null) +case "$comment_char" in +''|auto) + comment_char=# + ;; +?) + ;;

Re: [PATCH 1/2] push: --dry-run updates submodules when --recurse-submodules=on-demand

Am 15.11.2016 um 18:29 schrieb Brandon Williams: I'm assuming the reason we want to avoid sub-shells is for performance reasons right? Yes, every fork() saved is a win on Windows. (No pun intended ;) -- Hannes

Re: [PATCH 1/2] push: --dry-run updates submodules when --recurse-submodules=on-demand

Am 15.11.2016 um 02:18 schrieb Brandon Williams: diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 198ce84..e6ccc30 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -427,7 +427,31 @@ test_expect_success 'push unpushable

Re: 2.11.0-rc1 will not be tagged for a few days

Am 11.11.2016 um 22:07 schrieb Junio C Hamano: Junio C Hamano writes: OK, then let's have filter_git () { rm -f rot13-filter.log && git "$@" ... and call that -rc1. That is, to queue this on top of

Re: [PATCH v2] t6026: ensure that long-running script really is

Am 11.11.2016 um 22:09 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: Am 11.11.2016 um 21:48 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: Good point. Here is an updated version. Unfortunately, I already took the version before this one an

Re: [PATCH v2] t6026: ensure that long-running script really is

Am 11.11.2016 um 21:48 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: Good point. Here is an updated version. Unfortunately, I already took the version before this one and started my integration cycle today. I'll wiggle this in; it essentially is about adding a big c

Re: 2.11.0-rc1 will not be tagged for a few days

Am 11.11.2016 um 18:38 schrieb Lars Schneider: On 11 Nov 2016, at 18:31, Lars Schneider wrote: On 11 Nov 2016, at 18:05, Lars Schneider wrote: @Dscho: There is still one remaining new issue with t0021 ... investigating! "17 - required

[PATCH v2] t6026: ensure that long-running script really is

. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Am 11.11.2016 um 09:41 schrieb Jeff King: > But the other thing the "kill" is doing is make sure we clean up after > ourselves, even if another part of the t

[PATCH] t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

-by: Johannes Sixt <j...@kdbg.org> --- Am 11.11.2016 um 18:11 schrieb Johannes Sixt: > Am 11.11.2016 um 18:06 schrieb Junio C Hamano: >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >> >>> That test made the incorrect assumption that the path separator >>>

Re: [PATCH] mingw: hot-fix t5615

Am 11.11.2016 um 18:06 schrieb Junio C Hamano: Johannes Schindelin writes: That test made the incorrect assumption that the path separator character is always a colon. On Windows, it is a semicolon instead. Documentation/git.txt says that

Re: [PATCH] t6026: ensure that long-running script really is

Am 11.11.2016 um 00:53 schrieb Junio C Hamano: > Johannes Schindelin writes: > >> When making sure that background tasks are cleaned up in 5babb5b >> (t6026-merge-attr: clean up background process at end of test case, >> 2016-09-07), we considered to let the

Re: 2.11.0-rc1 will not be tagged for a few days

Am 08.11.2016 um 01:40 schrieb Jeff King: In addition to J6t's fix in t0021, ... Just to get things straight: Of my two patches, this one ("uniq -c variations") https://public-inbox.org/git/c842e0a7-b032-e0c4-0995-f11d93c17...@kdbg.org/ is a bug fix in my environment, and I have a

Re: [PATCH] t0021: expect more variations in the output of uniq -c

Am 06.11.2016 um 16:31 schrieb Lars Schneider: This looks good to me. I wonder if I should post a patch to add the "|| return" trick to the following function "test_cmp_exclude_clean", too?! The function does this: for FILE in "$expect" "$actual" do grep -v

Re: [PATCH (optional)] t0021: use arithmetic expansion to trim whitespace from wc -c output

Am 06.11.2016 um 16:45 schrieb Lars Schneider: > >> On 03 Nov 2016, at 21:22, Johannes Sixt <j...@kdbg.org> wrote: >> This is a pure optimization that reduces the number of forks, which >> helps a bit on Windows. >> >> There would be a solution w

Re: [PATCH 2/4] t0021: put $TEST_ROOT in $PATH

Am 03.11.2016 um 21:44 schrieb Jeff King: On Thu, Nov 03, 2016 at 09:40:01PM +0100, Johannes Sixt wrote: We have to use $PWD instead of $(pwd) because on Windows... Thanks. I have to admit I remain confused about which one to use at any given invocation No worries. It *is* complex, and I

Re: [PATCH 2/4] t0021: put $TEST_ROOT in $PATH

because on Windows the latter would add a C: style path to bash's Unix-style $PATH variable, which becomes confused by the colon after the drive letter. ($PWD is a Unix-style path.) Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t0021-conversion.sh | 2 +- 1 file changed, 1 inserti

Re: [PATCHv2 00/36] Revamp the attr subsystem!

Am 28.10.2016 um 20:54 schrieb Stefan Beller: previous discussion at https://public-inbox.org/git/20161022233225.8883-1-sbel...@google.com This implements the discarded series': jc/attr jc/attr-more sb/pathspec-label sb/submodule-default-paths This includes * The fixes for windows I've

[PATCH (optional)] t0021: use arithmetic expansion to trim whitespace from wc -c output

Instead of a pipeline with sed and a useless use of cat, return the unmodified text of wc -c from function file_size, but substitute the result with arithmetic expansion to get rid of the leading whitespace that some version of wc -c print. Signed-off-by: Johannes Sixt <j...@kdbg.

[PATCH] t0021: expect more variations in the output of uniq -c

Some versions of uniq -c write the count left-justified, other version write it right-justified. Be prepared for both kinds. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Here it is as a proper patch. Am 03.11.2016 um 01:41 schrieb Lars Schneider: >> On 2 Nov 2016, at 18:03, Joha

Re: [PATCH v11 13/14] convert: add filter..process option

Am 17.10.2016 um 01:20 schrieb larsxschnei...@gmail.com: > +# Compare two files and ensure that `clean` and `smudge` respectively are > +# called at least once if specified in the `expect` file. The actual > +# invocation count is not relevant because their number can vary. > +# c.f. >

Re: What's cooking in git.git (Oct 2016, #09; Mon, 31)

Am 02.11.2016 um 18:04 schrieb Torsten Bögershausen: >> * ls/filter-process (2016-10-17) 14 commits >> (merged to 'next' on 2016-10-19 at ffd0de042c) > > Some (late, as I recently got a new battery for the Mac OS 10.6 test system) > comments: > t0021 failes here: > > > Can't locate object

Re: [PATCHv2 27/36] attr: convert to new threadsafe API

Am 29.10.2016 um 00:06 schrieb Junio C Hamano: Probably this needs to be squashed in, now the MinGW discussion has settled. Yes, this looks good. Thank you very much, both of you. As I said, I won't be able to test this until late next week. -- Hannes attr.c | 2 +- common-main.c

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 28.10.2016 um 22:29 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: Another problem with the proposed patch is that there is no declaration for attr_start() before the call in compat/mingw.c. We would have to move the declaration of attr_start() to cache.h (for e

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 28.10.2016 um 20:48 schrieb Jacob Keller: On Fri, Oct 28, 2016 at 4:58 AM, Johannes Schindelin wrote: Hi Jake, On Thu, 27 Oct 2016, Jacob Keller wrote: I agree with Stefan that there isn't really a great place to put a dynamic initialization. Ummm. Wait.

Re: [PATCH] attr: convert to new threadsafe API

Am 28.10.2016 um 00:15 schrieb Stefan Beller: * use attr_start on Windows to dynamically initialize the Single Big Attr Mutex I'm sorry, I didn't find time to test the patch on Windows. I won't be back at my Windows box before Wednesday. -- Hannes

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 27.10.2016 um 23:49 schrieb Jacob Keller: Ok, so I've been reading this thread. I don't understand your objections to emulating in this way.. Could you clearly spell out why you believe this solution isn't acceptable? So far all I've understood was "it's not critical sections" and "it

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 27.10.2016 um 21:08 schrieb Stefan Beller: On Thu, Oct 27, 2016 at 11:49 AM, Junio C Hamano <gits...@pobox.com> wrote: Johannes Sixt <j...@kdbg.org> writes: Am 27.10.2016 um 19:01 schrieb Stefan Beller: ... It is not possible to mark a mutex uninitialized on Windows without an

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 27.10.2016 um 19:01 schrieb Stefan Beller: Johannes Sixt <j...@kdbg.org> writes: This is the pessimization that I am talking about. I would not mind at all if it were only for the attribute subsystem, but the proposed patch would pessimize *all* uses of pthread_mutex_lock. It woul

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 27.10.2016 um 08:21 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: As many codepaths may not even need access to the attributes, I doubt that would be a very productive direction to go. So, what is productive then? Pessimizing one (not exactly minor) platform?

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 27.10.2016 um 08:02 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: Am 26.10.2016 um 23:57 schrieb Stefan Beller: In Windows it is not possible to have a static initialized mutex as of now, but that seems to be painful for the upcoming refactoring of the attribute sub

Re: [PATCH] compat: Allow static initializer for pthreads on Windows

Am 26.10.2016 um 23:57 schrieb Stefan Beller: In Windows it is not possible to have a static initialized mutex as of now, but that seems to be painful for the upcoming refactoring of the attribute subsystem, as we have no good place to put the initialization of the attr global lock. Please

Re: [PATCH 27/36] attr: convert to new threadsafe API

Am 26.10.2016 um 22:26 schrieb Jeff King: On Wed, Oct 26, 2016 at 10:25:38PM +0200, Johannes Sixt wrote: Am 26.10.2016 um 21:51 schrieb Stefan Beller: it is very convenient to not have to explicitly initialize mutexes? Not to initialize a mutex is still wrong for pthreads. I think Stefan

Re: [PATCH 27/36] attr: convert to new threadsafe API

Am 26.10.2016 um 21:51 schrieb Stefan Beller: it is very convenient to not have to explicitly initialize mutexes? Not to initialize a mutex is still wrong for pthreads. -- Hannes

Re: [PATCH v2 2/2] read-cache: make sure file handles are not inherited by child processes

Am 24.10.2016 um 21:53 schrieb Lars Schneider: On 24 Oct 2016, at 21:22, Johannes Sixt <j...@kdbg.org> wrote: Am 24.10.2016 um 20:03 schrieb larsxschnei...@gmail.com: From: Lars Schneider <larsxschnei...@gmail.com> This fixes "convert: add filter..process option"

Re: What's cooking in git.git (Oct 2016, #06; Mon, 24)

Am 25.10.2016 um 20:13 schrieb Stefan Beller: On Tue, Oct 25, 2016 at 10:15 AM, Junio C Hamano wrote: - the "off-by-one fix" part of sb/submodule-ignore-trailing-slash needs to be in the upcoming release but the "trailing /. in base should not affect the resolution of

Re: [PATCH 2/3] submodule tests: replace cloning from . by "$(pwd)"

Am 24.10.2016 um 21:10 schrieb Stefan Beller: The ease of use in our own testing suite is the feature I was talking about. Ok, thanks for the clarification. Next steps would then be, IMO, to fix the tests to match the future world order and mark tests that fail due to the bug with

Re: [PATCH v2 2/2] read-cache: make sure file handles are not inherited by child processes

Am 24.10.2016 um 20:03 schrieb larsxschnei...@gmail.com: From: Lars Schneider This fixes "convert: add filter..process option" (edcc8581) on Windows. Today's next falls flat on its face on Windows in t0021.15 "required process filter should filter data"; might it

Re: [PATCH 2/3] submodule tests: replace cloning from . by "$(pwd)"

Am 22.10.2016 um 22:46 schrieb Stefan Beller: I have looked into it again, and by now I think the bug is a feature, actually. Consider this: git clone . super git -C super submodule add ../submodule # we thought the previous line is buggy git clone super super-clone At this

Re: [PATCH 2/3] submodule tests: replace cloning from . by "$(pwd)"

Am 22.10.2016 um 01:59 schrieb Stefan Beller: When adding a submodule via "git submodule add ", the relative url applies to the superprojects remote. When the superproject was cloned via "git clone . super", the remote url is ending with '/.'. The logic to construct the relative urls is not

Re: Drastic jump in the time required for the test suite

Am 20.10.2016 um 23:38 schrieb Jeff King: test_cmp () { # optimize for common "they are the same" case # without any subshells or subprograms We do this already on Windows; it's the function mingw_test_cmp in our test suite:

Re: Drastic jump in the time required for the test suite

Am 20.10.2016 um 14:31 schrieb Jeff King: Close to 1/3 of those processes are just invoking the bin-wrapper script to set up the EXEC_PATH, etc. I imagine it would not be too hard to just do that in the test script. In fact, it looks like: make prefix=/wherever install

Re: [PATCH 1/2] submodule: ignore trailing slash on superproject URL

Am 17.10.2016 um 21:32 schrieb Johannes Sixt: > I think that we could reduce the confusion by converting all $PWD to > $(pwd) in these test cases. I don't remember why I suggested to use $PWD > for one of the arguments of the test cases (the second must be $(pwd)), > but the most l

Re: [PATCH 1/2] submodule: ignore trailing slash on superproject URL

Am 17.10.2016 um 09:10 schrieb Junio C Hamano: And I agree from that point of view that having to spell both sides as $(pwd) would mean you are not testing that "Unixy input to Windowsy output" expectation, but at the same time, I think you would want "Windowsy input to Windowsy output"

Re: [PATCH v3 25/25] sequencer: mark all error messages for translation

Am 13.10.2016 um 16:56 schrieb Johannes Schindelin: On Wed, 12 Oct 2016, Junio C Hamano wrote: You have at least two independent changes relative to Dscho's version. (1) Show line breaks more prominently by avoiding "\n\n" and breaking the string at "\n"; this matches the way how the

Re: [PATCH v3 25/25] sequencer: mark all error messages for translation

note that _( is not moved to the beginning of the line because it would be picked up as hunk header by git diff. 8< From: Johannes Schindelin <johannes.schinde...@gmx.de> Subject: [PATCH] sequencer: mark all error messages for translation There was actually only one error messag

Re: [PATCHv2] attr: convert to new threadsafe API

Am 12.10.2016 um 01:59 schrieb Stefan Beller: +void git_attr_check_initl(struct git_attr_check **check_, + const char *one, ...) { - struct git_attr_check *check; int cnt; va_list params; const char *param; + struct git_attr_check

Re: git 2.10.1 test regression in t3700-add.sh

Am 10.10.2016 um 19:41 schrieb Junio C Hamano: I also notice that the problematic test uses "chmod 755"; don't we need POSIXPERM prerequisite on this test, too, I wonder? Good point. Without POSIXPERM the test demonstrate that, since chmod 755 is basically a noop, the following add --chmod=-x

Re: [PATCH v2 20/25] sequencer: left-trim lines read from the script

Am 09.10.2016 um 10:57 schrieb Johannes Schindelin: Good point. I decided to do it at a different level, though: parse_insn_line() should already receive the line without trailing end-of-line markers (this was already the case for LF-only todo scripts). I reused your commit message and touched

Re: [PATCH v4 4/4] mergetool: honor -O

With this final fixup, the series looks good to me, and I have no further comments. Reviewed-by: Johannes Sixt <j...@kdbg.org> -- Hannes

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

Am 07.10.2016 um 14:27 schrieb Duy Nguyen: On Fri, Oct 7, 2016 at 6:20 PM, Johannes Schindelin wrote: Hi Junio, On Thu, 6 Oct 2016, Junio C Hamano wrote: Nguyễn Thái Ngọc Duy writes: Throwing something at the mailing list to see if anybody

Re: [PATCH 4/4] mergetool: honor -O

Am 07.10.2016 um 01:47 schrieb David Aguilar: diff --git a/git-mergetool.sh b/git-mergetool.sh index 65696d8..9dca58b 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt]

Re: [PATCH 3/4] mergetool: honor diff.orderFile

Am 07.10.2016 um 01:47 schrieb David Aguilar: @@ -606,4 +606,37 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT git reset --hard master >/dev/null 2>&1 ' +test_expect_success 'diff.orderFile configuration is honored' ' + test_config

Re: [PATCH 2/4] mergetool: move main program flow into a main() function

Am 07.10.2016 um 01:47 schrieb David Aguilar: Signed-off-by: David Aguilar --- An answer to "why?" is missing here. I guess it is just so that everything happens in functions, and that there is only the invocation of main at the top-level of the script. I am unsure whether

Re: [PATCH 1/2] files_read_raw_ref: avoid infinite loop on broken symlinks

Am 06.10.2016 um 18:48 schrieb Jeff King: +test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' ' + ln -s does-not-exist .git/broken && + test_must_fail git rev-parse --verify broken Hm, lower-case named refs directly in .git are frowned upon, no? If we

Re: [PATCH v2 20/25] sequencer: left-trim lines read from the script

ttached to "echo", which leads to the unknown command "echo\r". Work it around by stripping CR before the command specified with exec is passed to the shell. This happens to fix t9903.14 and .15 in my environment: the insn sheet constructed here contains CRLF thanks to MSY

Re: Feature Request: user defined suffix for temp files created by git-mergetool

Am 05.10.2016 um 09:47 schrieb Josef Ridky: Add support for user defined suffix part of name of temporary files created by git mergetool Do I understand correctly that your users have problems to identify which of the "_BASE_", "_LOCAL_", "_REMOTE_" and "_BACKUP_" files they must edit? I

Re: [PATCH v8 00/11] Git filter protocol

Am 29.09.2016 um 20:18 schrieb Torsten Bögershausen: I would agree that Git should not wait for the filter. But does the test suite need to wait for the filter ? We have fixed a test case on Windows recently where a process hung around too long (5babb5bd). So, yes, the test suite has to wait

Re: [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits

Am 29.09.2016 um 01:30 schrieb Junio C Hamano: As Peff said, responding in a thread started by Linus's suggestion to raise the default abbreviation to 12 hexdigits: This is waayy too large for a new default. The vast majority of repositories is smallish. For those, the long sequences of hex

Re: [PATCH] git-gui: stop using deprecated merge syntax

log config suitably. But this works too, and is much more obvious. Tested-by: Johannes Sixt <j...@kdbg.org> -- Hannes

Re: Limitiations of git rebase --preserve-merges --interactive

Am 23.09.2016 um 17:50 schrieb Stefan Haller: And I don't see any tests that do rebase -p -i and actually do something interesting with the -i part. So my original question still remains. :-) -i -p came first. -p without -i was bolted on later. -- Hannes

Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

Am 21.09.2016 um 23:12 schrieb Junio C Hamano: Johannes Sixt <j...@kdbg.org> writes: But I came to a different conclusion as I said in a message that crossed yours. I hope Thomas can pick up the baton again. Yeah, our mails crossed, apparently, and I do agree with your reasoning. How

Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

Am 21.09.2016 um 22:47 schrieb Junio C Hamano: -test_expect_success 'file status is changed after git add --chmod=+x' ' - echo "AM foo4" >expected && +test_expect_success 'git add --chmod=[+-]x changes index with newly added file' ' echo foo >foo4 && git add foo4 &&

Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

Am 21.09.2016 um 20:12 schrieb Junio C Hamano: Thomas Gummerer writes: I am surprised that add --chmod=+x changes only the index, but not the file on disk!?! I *think* --chmod is mainly thought of as a convenience for git users on a filesystem that doesn't have an

[PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

A recently introduced test checks the result of 'git status' after setting the executable bit on a file. This check does not yield the expected result when the filesystem does not support the executable bit (and core.filemode is false). Skip the test case. Signed-off-by: Johannes Sixt &l

[PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently

' again. Use -p with mkdir so that it does not fail if 'sub' already exists. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t3700-add.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 0a962a6..16ab2da 100755 --- a/t/t3700-add.sh +

Re: [PATCH v2 21/25] sequencer: refactor write_message()

Am 11.09.2016 um 12:55 schrieb Johannes Schindelin: -static int write_message(struct strbuf *msgbuf, const char *filename) +static int write_with_lock_file(const char *filename, + const void *buf, size_t len, int append_eol) { static struct lock_file

[PATCH v2] t6026-merge-attr: clean up background process at end of test case

case advances. Helped-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Am 06.09.2016 um 09:25 schrieb Johannes Schindelin: > Maybe we should write a pid file in the sleep command instead, and kill it > in the end? Something like

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