Re: [PATCH v6 4/4] config: add '--show-origin' option to print the origin of a config value

Am 03.03.2016 um 08:38 schrieb Lars Schneider: (1) If I have a Git core branch with a some changes that builds and tests clean on Linux and OSX. How do I apply all the necessary Git for Windows specific changes to this branch? How do you do it when you make a patch on Linux and want to test it

Re: "./t0001-init.sh --valgrind" is broken

Am 03.03.2016 um 13:09 schrieb Duy Nguyen: +the-other-Johannes who added valgrind support. On Thu, Mar 3, 2016 at 1:55 PM, Johannes Sixt <j...@kdbg.org> wrote: 8< Subject: [PATCH] t0001: fix GIT_* environment variable check under --valgrind When a test case is run without -

Re: "./t0001-init.sh --valgrind" is broken

rip conditially defined environment variables from both expected and actual output. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t0001-init.sh | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 295aa59..a5b9e

Re: [PATCH v6 4/4] config: add '--show-origin' option to print the origin of a config value

Am 19.02.2016 um 10:16 schrieb larsxschnei...@gmail.com: +test_expect_success '--show-origin with --list' ' + cat >expect <<-EOF && + file:$HOME/.gitconfig user.global=true + file:$HOME/.gitconfig user.override=global + file:$HOME/.gitconfig

Re: [PATCH 1/2] submodule: port resolve_relative_url from shell to C

Am 13.02.2016 um 00:39 schrieb Stefan Beller: > @@ -289,4 +296,39 @@ test_git_path GIT_COMMON_DIR=bar config > bar/config > test_git_path GIT_COMMON_DIR=bar packed-refs bar/packed-refs > test_git_path GIT_COMMON_DIR=bar shallow bar/shallow >

Re: [PATCH v2] Mark win32's pthread_exit() as NORETURN

Am 01.03.2016 um 15:13 schrieb Johannes Schindelin: The pthread_exit() function is not expected to return. Ever. On Windows, we call ExitThread() whose documentation claims: "This function does not return a value.": https://msdn.microsoft.com/en-us/library/windows/desktop/ms682659

Re: [PATCH] run-command: do not pass child process data into callbacks

Am 29.02.2016 um 22:57 schrieb Stefan Beller: > The expected way to pass data into the callback is to pass them via > the customizable callback pointer. The error reporting in > default_{start_failure, task_finished} is not user friendly enough, that > we want to encourage using the child data for

Re: [PATCHv19 00/11] Expose submodule parallelism to the user

Am 29.02.2016 um 22:19 schrieb Junio C Hamano: Stefan Beller writes: Maybe we want to remove the struct child_process from the function signature of the callbacks and callbacks need to rely on the data provided solely thru the pointer as passed around for callback

Re: [PATCHv19 00/11] Expose submodule parallelism to the user

Hi folks, we have a major breakage in the parallel tasks infrastructure, and I'm afraid it is already in master. Instrument the code in sb/submodule-parallel-update like this and enjoy the fireworks of './t7400-submodule-basic.sh -v -i -x --debug': diff --git a/git-submodule.sh

Re: [PATCH 1/3] t5313: test bounds-checks of corrupted/malicious pack/idx files

ite_bytes? ---- 8< From: Johannes Sixt <j...@kdbg.org> Subject: [PATCH] tests: overwrite bytes in files using a perl script instead of dd The dd in my build environment on Windows crashes unpredictably. Work it around by rewriting most instances with a helper function that uses perl behin

[PATCH v2] test-lib: limit the output of the yes utility

commit message] Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Johannes Sixt <j...@kdbg.org> --- Am 02.02.2016 um 09:21 schrieb Johannes Schindelin: > On Tue, 2 Feb 2016, Johannes Sixt wrote: >> On Windows, there is no SIGPIPE. > > True.

[PATCH] test-lib: limit the output of the yes utility

amount of output that is sufficient for the test suite. The amount chosen should be sufficiently high for any test case, assuming that future test cases will not exaggerate their demands of input from an upstream 'yes' invocation. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- This does n

Re: [bug] Possible Windows 'git mv' bug

Am 31.01.2016 um 15:03 schrieb Aaron Gray: Hi, I think I have found a possible difference in behaviour between Windows git commandline distro and Linux git basically If I do a :- git mv logger.h Logger.h I get the following :- fatal: destination exists, source=lib/logger.h,

Re: [PATCH] attempt connects in parallel for IPv6-capable builds

Am 29.01.2016 um 02:41 schrieb Eric Wong: Junio C Hamano wrote: Eric Wong writes: getaddrinfo() may return multiple addresses, not all of which are equally performant. In some cases, a user behind a non-IPv6 capable network may get an IPv6 address

[PATCH] mingw: avoid linking to the C library's isalpha()

. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- compat/mingw.c | 7 +++ compat/mingw.h | 7 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 10a51c0..0cebb61 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1915,6 +1915,13 @@

Re: [PATCH v4 1/4] Refactor skipping DOS drive prefixes

dos_drive_prefix() out of line] Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Johannes Sixt <j...@kdbg.org> --- compat/basename.c | 4 +--- compat/mingw.c| 21 - compat/mingw.h| 5 - git-compat-util.h | 8 path

Re: [PATCH 09/19] mingw: accomodate t0060-path-utils for MSYS2

Am 24.01.2016 um 16:44 schrieb Johannes Schindelin: > On Windows, there are no POSIX paths, only Windows ones (an absolute > Windows path looks like "C:\Program Files\Git\ReleaseNotes.html", under > most circumstances, forward slashes are also allowed and synonymous to > backslashes). > > So when

Re: [PATCH v4 1/4] Refactor skipping DOS drive prefixes

Am 23.01.2016 um 09:25 schrieb Johannes Schindelin: Hi Junio, On Fri, 22 Jan 2016, Junio C Hamano wrote: Johannes Sixt <j...@kdbg.org> writes: I suggest to move the function definition out of line: diff --git a/compat/mingw.c b/compat/mingw.c index 10a51c0..0cebb61 100644 --- a/

Re: [PATCH v4 1/4] Refactor skipping DOS drive prefixes

Am 12.01.2016 um 08:57 schrieb Johannes Schindelin: > diff --git a/compat/mingw.h b/compat/mingw.h > index 57ca477..b3e5044 100644 > --- a/compat/mingw.h > +++ b/compat/mingw.h > @@ -361,7 +361,15 @@ HANDLE winansi_get_osfhandle(int fd); >* git specific compatibility >*/ > > -#define

Re: [PATCHv2 1/2] submodule: port resolve_relative_url from shell to C

Am 20.01.2016 um 03:03 schrieb Stefan Beller: > +static char *last_dir_separator(char *str) > +{ > + char *p = str + strlen(str); > + while (p-- > str) > + if (is_dir_sep(*p)) > + return p; > + return NULL; > +} > + I just noticed that we already have

jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20))

e. But with this series applied, all of them are now resolved automatically and correctly. That's a nice achievement! Tested-by: Johannes Sixt <j...@kdbg.org> I don't have the original submission anymore. So, I'm responding here. Generally, the patches make sense. Except for 510936082eb4 &

Re: [PATCH 07/10] t5100-mailinfo.sh: use the $( ... ) construct for command substitution

that I won't forget (I'll need to amend with your sign-off even if this one is satisfactory to you). -- >8 -- From: Johannes Sixt <j...@kdbg.org> Date: Tue, 22 Dec 2015 19:35:16 +0100 Subject: [PATCH] t5100: no need to use 'echo' command substitutions for globbing Instead of making the

Re: [PATCH v2 0/3] nd/clear-gitenv-upon-use-of-alias

Am 23.12.2015 um 10:37 schrieb Jeff King: The second line comes from handle_alias itself. It calls die_errno whenever run_command returns a negative value. However, only -1 indicates a syscall error where errno has something useful (note that it says the useless "success" above). Instead, we

Re: [PATCH 07/10] t5100-mailinfo.sh: use the $( ... ) construct for command substitution

Am 22.12.2015 um 16:27 schrieb Elia Pinto: -for mail in `echo 00*` +for mail in $(echo 00*) -for mail in `echo rfc2047/00*` +for mail in $(echo rfc2047/00*) True, these are equvalence transformations. But a better way to get rid of the back-quotes is to write these lines as for mail in

Re: [PATCH 07/10] t5100-mailinfo.sh: use the $( ... ) construct for command substitution

Am 22.12.2015 um 19:35 schrieb Johannes Sixt: Am 22.12.2015 um 16:27 schrieb Elia Pinto: -for mail in `echo 00*` +for mail in $(echo 00*) -for mail in `echo rfc2047/00*` +for mail in $(echo rfc2047/00*) True, these are equvalence transformations. But a better way to get rid of the back

Re: Odd rebase behavior

Am 18.12.2015 um 19:05 schrieb John Keeping: On Fri, Dec 18, 2015 at 11:43:16AM -0600, David A. Greene wrote: John Keeping writes: It seems that the problem is introduces by --preserve-merges (and -Xsubtree causes something interesting to happen as well). I see the

Re: [PATCH v2] mingw: emulate write(2) that fails with a EPIPE

} + + return result; +} + int mingw_access(const char *filename, int mode) { wchar_t wfilename[MAX_PATH]; Looks good. I tested the patch, and it fixes the failure exposed by t5571.11. Acked-by: Johannes Sixt <j...@kdbg.org> Thanks! -- Hannes -- To unsubscribe from this list:

Re: [PATCHv2] submodule: Port resolve_relative_url from shell to C

Am 17.12.2015 um 01:26 schrieb Stefan Beller: > This reimplements the helper function `resolve_relative_url` in shell > in C. This functionality is needed in C for introducing the groups > feature later on. When using groups, the user should not need to run > `git submodule init`, but it should be

Re: [PATCHv2] submodule: Port resolve_relative_url from shell to C

Am 17.12.2015 um 19:55 schrieb Johannes Sixt: As to the implementation, find a patch below that removes the ifdefs and a few other suggestions. The word "offers" is missing in this last half-sentence ;) -- To unsubscribe from this list: send the line "unsubscribe git" in t

[PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'

Use the modern `git merge' invocation pattern. Since both `git merge' and `git fmt-merge-msg' obey the merge.log configuration, instruct the former not to generate the log summary to avoid that it appears twice in the commit message. Signed-off-by: Johannes Sixt <j...@kdbg.org> --

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

Am 15.12.2015 um 01:25 schrieb Stefan Beller: I was actually thinking about using {without-x}read, just the plain system call. Do we have any issues with that for wrapping purposes for Windows? xread() limits the size being read to MAX_IO_SIZE, which is needed on some systems (I think that

Re: [PATCH 0/8] Rerolling sb/submodule-parallel-fetch for the time after 2.7

llel-fetch that includes my suggested improvements, and the result is identical to this series except for the trace output mentioned in the last bullet point. With or without addressing my note about the commit message in 6/8: Acked-by: Johannes Sixt <j...@kdbg.org> Thanks, Stefan Jo

Re: [PATCH 6/8] run-command: add an asynchronous parallel child processor

Am 14.12.2015 um 20:37 schrieb Stefan Beller: This allows to run external commands in parallel with ordered output on stderr. If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe,

sb/submodule-parallel-fetch, was: Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

Am 11.12.2015 um 00:55 schrieb Stefan Beller: > On Thu, Dec 10, 2015 at 3:51 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> * sb/submodule-parallel-fetch (2015-11-24) 17 commits ... >>> >>> I assume you plan on merging this after 2.7

Re: sb/submodule-parallel-fetch, was: Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

Am 11.12.2015 um 23:52 schrieb Stefan Beller: If you don't mind I'll split your patch into chunks and squash these where appropriate I don't mind at all; please pick what you like. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH] submodule: Port resolve_relative_url from shell to C

Am 10.12.2015 um 02:07 schrieb Stefan Beller: This reimplements the helper function `resolve_relative_url` in shell in C. This functionality is needed in C for introducing the groups feature later on. When using groups, the user should not need to run `git submodule init`, but it should be

Re: [PATCH v2] revision.c: fix possible null pointer access

Am 07.12.2015 um 21:31 schrieb Junio C Hamano: Stefan Naewe writes: mark_tree_uninteresting dereferences a tree pointer before checking if the pointer is valid. Fix that by doing the check first. Signed-off-by: Stefan Naewe --- I still have

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

Am 24.11.2015 um 15:45 schrieb SZEDER Gábor: git-sh-setup's require_clean_work_tree() always exits with error on an orphan branch, even when the index and worktree are both clean. The reason is that require_clean_work_tree() starts off with verifying HEAD, to make sure that it can safely pass

Re: [PATCH v2] blame: add support for --[no-]progress option

Am 22.11.2015 um 17:02 schrieb Edmundo Carmona Antoranz: Will also affect annotate Signed-off-by: Edmundo Carmona Antoranz --- Documentation/blame-options.txt | 7 +++ Documentation/git-blame.txt | 9 - builtin/blame.c | 25

Re: [PATCH 3/2] test: factor out helper function test_must_contain

Am 20.11.2015 um 21:50 schrieb René Scharfe: Extract a helper function for searching for a pattern in a file and printing the whole file if the pattern is not found. It is useful when starting tests with --verbose for debugging purposes. +# Check if a file contains an expected pattern.

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

Am 20.11.2015 um 23:05 schrieb Jonathan Nieder: Stefan Beller wrote: Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross

[PATCH 3/7] modernize t9300: use test_must_be_empty

Instead of comparing actual output to an empty file, use test_must_be_empty. In addition to the better error message provided by the helper, allocation of an empty file during the setup sequence can be avoided. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.

[PATCH 0/7] Modernize t9300-fast-import

to the list, the series is also available from https://github.com/j6t/git.git modernize-t9300 Johannes Sixt (7): modernize t9300: single-quote placement and indentation modernize t9300: use test_must_fail modernize t9300: use test_must_be_empty modernize t9300: wrap lines after &&

[PATCH 1/7] modernize t9300: single-quote placement and indentation

with a tab. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 872 + 1 file changed, 437 insertions(+), 435 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 9984c48..566f7bd 100755 --- a/t

[PATCH 2/7] modernize t9300: use test_must_fail

One test case open-codes a test for an expected failure. Replace it by test_must_fail. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 17 +++-- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-imp

[PATCH 6/7] modernize t9300: mark here-doc words to ignore tab indentation

&& that will become necessary. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 200 - 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index adabd68.

[PATCH 5/7] modernize t9300: use test_when_finished for clean-up

A number of clean-ups of test cases are performed outside of test_expect_success. Replace these cases by using test_when_finished. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 36 1 file changed, 16 insertions(+), 20 del

[PATCH 4/7] modernize t9300: wrap lines after &

It is customary to have each command in test snippets on its own line. Fix those instances that do not follow this guideline. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 48 1 file changed, 32 insertions(

[PATCH 7/7] modernize t9300: move test preparations into test_expect_success

Our usual style these days is to execute everything inside test_expect_success. Make it so. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- t/t9300-fast-import.sh | 2580 1 file changed, 1297 insertions(+), 1283 deletions(-) diff --git a/t

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

Am 11.11.2015 um 21:37 schrieb Stefan Beller: including the list and all others this time. if (code < 0) { pp->shutdown = 1; - kill_children(pp, SIGTERM); + kill_children(pp,

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

Am 11.11.2015 um 21:53 schrieb Stefan Beller: On Wed, Nov 11, 2015 at 12:48 PM, Johannes Sixt <j...@kdbg.org> wrote: I wonder why task_finish() callback gets to choose a signal. The point here is, IIUC, when one child dies, the others must be halted, too. SIGTERM seems to be the only se

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

Am 07.11.2015 um 00:48 schrieb Stefan Beller: Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross platform operation. (It's less

Re: [PATCH 1/2] run-command: Remove set_nonblocking

Am 06.11.2015 um 20:00 schrieb Stefan Beller: On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt <j...@kdbg.org> wrote: Here is a prototype patch. Feel free to pick it up. It marks a process whose EOF we have found by setting .err to -1. It's probably better to extend the meaning of the

Re: [PATCH 1/2] run-command: Remove set_nonblocking

Am 05.11.2015 um 19:17 schrieb Stefan Beller: > strbuf_read_once can also operate on blocking file descriptors if we are > sure they are ready. The poll (2) command however makes sure this is the > case. > > Reading the manual for poll (2), there may be spurious returns indicating > readiness but

Re: [PATCH 1/2] run-command: Remove set_nonblocking

Am 05.11.2015 um 23:20 schrieb Stefan Beller: On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt <j...@kdbg.org> wrote: diff --git a/run-command.c b/run-command.c index 51d078c..3e42299 100644 --- a/run-command.c +++ b/run-command.c @@ -977,7 +977,7 @@ static struct parallel_processes *pp_in

Re: [PATCHv3 02/11] run-command: report failure for degraded output just once

Am 04.11.2015 um 21:14 schrieb Stefan Beller: On Wed, Nov 4, 2015 at 10:14 AM, Junio C Hamano wrote: Imagine that we are running two things A and B at the same time. We ask poll(2) and it says both A and B have some data ready to be read, and we try to read from A.

Re: git.git as of tonight

Am 03.11.2015 um 19:18 schrieb Stefan Beller: ... ReadFileEx ... "overlapped" operation. Let's not go there just yet. 1. Make this an optional feature so that platforms can compile it out, if it is not already done. My preference, even if we go that route, would be to see if we

Re: git.git as of tonight

Am 03.11.2015 um 00:06 schrieb Stefan Beller: On Mon, Nov 2, 2015 at 1:15 PM, Johannes Sixt <j...@kdbg.org> wrote: run-command.c: In function 'set_nonblocking': run-command.c:1011: error: 'F_GETFL' undeclared (first use in this function) run-command.c:1011: error: (Each undeclared iden

Re: git.git as of tonight

Am 02.11.2015 um 03:58 schrieb Junio C Hamano: > * sb/submodule-parallel-fetch (2015-10-21) 14 commits >(merged to 'next' on 2015-10-23 at 8f04bbd) > + run-command: fix missing output from late callbacks > + test-run-command: increase test coverage > + test-run-command: test for

Re: [PATCH v4] ref-filter: fallback on alphabetical comparison

results (i.e. the order of listing refs with equal values cannot be pre-determined) as pointed out by Johannes Sixt ($gmane/280117). Hence, fallback to alphabetical comparison based on the refname whenever the other criterion is equal. A test in t3203 was expecting that branch-two sorts before

Re: git-gui is still using old-style git-merge invocation

Thanks! -- 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

git-gui is still using old-style git-merge invocation

Performing a merge with git gui presents the following message in the merge result window: warning: old-style 'git merge HEAD ' is deprecated. Merge made by the 'recursive' strategy. a | 1 + 1 file changed, 1 insertion(+) create mode 100644 a But I am unable to find where the invocation

t3203: --sort=objectsize failure on Windows

On Windows, I observe a failure of the test case 'git branch `--sort` option' introduced by aedcb7dc (branch.c: use 'ref-filter' APIs). The reason is that the resulting order generated by qsort is unspecified for entries that compare equal. In fact, the test case sorts 4 entries where there

[PATCH 2/2 jk/war-on-sprintf] compat/mingw.c: remove printf format warning

d in place of the typedef-ed type DWORD, which hides that it is actually an unsigned long. There is no correctness issue with the old code because unsigned long and unsigned are always of the same size on Windows, even in 64-bit builds. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- I

[PATCH 1/2 jk/war-on-sprintf] read_branches_file: plug a FILE* leak

in .git/branches/origin, because by the time that the command attempts to remove this file, it is still open. Signed-off-by: Johannes Sixt <j...@kdbg.org> --- remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/remote.c b/remote.c index 1101f82..fb16153 100644 --- a/remote.c +++ b/re

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

Am 21.10.2015 um 17:51 schrieb Ramsay Jones: On 20/10/15 22:24, Junio C Hamano wrote: Junio C Hamano writes: some numbers on my desktop (Dell T3500 2.66GHz Xeon X5650 with 12GB, running Ubuntu), I suspect that I haven't tested exactly the same version as you, but I had a

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

Am 03.10.2015 um 09:37 schrieb Chris Packham: On Sat, Oct 3, 2015 at 6:43 AM, Junio C Hamano wrote: If you want to go interactive from the hook, you'd have to open and interact with /dev/tty yourself in your hook anyway. That may be what I have to do, although I have

Re: More builtin git-am issues..

Am 05.09.2015 um 02:54 schrieb Junio C Hamano: Linus Torvalds writes: So I think that logic should basically be extended to saying - if any line in the last chunk has a "Signed-off-by:", set a flag. - at the end of the loop, if that flag wasn't set, return

Re: [PATCH] Mingw: verify both ends of the pipe () call

Am 27.08.2015 um 23:50 schrieb Jonathan Nieder: Johannes Schindelin wrote: From: jfmc jfm...@gmail.com This means the name shown by git shortlog would be jfmc instead of Jose F. Morales. Intended? The code to open and test the second end of the pipe clearly imitates the code for the first

Re: git merge changes file mode from 644 to 755

Am 14.08.2015 um 14:02 schrieb Dmitry Oksenchuk: Hello, I've noticed strange behavior of git merge on Windows with core.filemode=false (set by default). Git changed mode of some files from 644 to 755 for unknown reason. One of the files is stdafx.cpp, it's absent in the common ancestor, it was

Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

Am 13.08.2015 um 09:30 schrieb Johannes Schindelin: Hi Johannes, On 2015-08-12 20:31, Johannes Sixt wrote: Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund: On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: FWIW Git for Windows has this patch (that I wanted

Re: [PATCH] revisions --stdin: accept CRLF line terminators

Am 12.08.2015 um 00:14 schrieb Junio C Hamano: Now, I am wondering if it makes sense to do these two things: * Teach revision.c::read_revisions_from_stdin() to use strbuf_getline() instead of strbuf_getwholeline(). * Teach strbuf_getline() to remove CR at the end when stripping the

[PATCH jk/prune-mtime] prune: close directory earlier during loose-object directory traversal

-by: Johannes Sixt j...@kdbg.org --- My Windows 8.1 machine does not require this fix for some unkonwn reason. But we still cater for Windows XP users, where this change is a real improvement. sha1_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sha1_file.c b

Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund: On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in

[PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

that the code just works. Signed-off-by: Johannes Sixt j...@kdbg.org --- t/t5601-clone.sh | 6 -- 1 file changed, 6 deletions(-) diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 9b34f3c..df69bf6 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -353,12 +353,6 @@ test_expect_success 'plink

[PATCH] revisions --stdin: accept CRLF line terminators

by CRs that end up in the file $todo.miss, because many tools of the MSYS toolset force LF to CRLF conversion when regular files are written via stdout. To fix the error, permit CRLF line terminators when revisions and pathspec are read using the --stdin option. Signed-off-by: Johannes Sixt j

[PATCH ee/clean-remove-dirs] t7300-clean: require POSIXPERM for chmod 0 test

the POSIXPERM prerequisite on the test case. Signed-off-by: Johannes Sixt j...@kdbg.org --- This fixes a new failure in the test suite (t3404.8[67]) on Windows, but I got around to debug it only now. t/t7300-clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7300

Re: git branch command is incompatible with bash

Am 27.07.2015 um 23:49 schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: Try branchName=$(git rev-parse --abbrev-ref HEAD) Hmm, interesting. $ git checkout --orphan notyet $ git rev-parse --abbrev-ref HEAD $ git symbolic-ref --short HEAD Please don't scare

Re: git branch command is incompatible with bash

Am 28.07.2015 um 17:23 schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: Are you trying to say that the result of 'rev-parse --abbrev-ref HEAD' is suboptimal and that of 'symbolic-ref --short HEAD' is OK? My Interesting was primarily about that I wasn't aware of the --abbrev-ref

Re: git branch command is incompatible with bash

Am 27.07.2015 um 14:12 schrieb Anatol Rudolph: When using the git branch command, git uses a '*' to denote the current branch. Therefore, in bash this: $ branchName=$(git branch -q) $ echo $branchName produces a directory listing, because the '*' is interpreded by the shell.

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

Am 19.07.2015 um 09:37 schrieb Johannes Schindelin: On 2015-07-19 08:54, Johannes Sixt wrote: Am 18.07.2015 um 17:21 schrieb Ben Walton: - sed -e s/CHANGE_ME/change_me/ file file+ - mv -f file+ file + perl -pi -e s/CHANGE_ME/change_me/ file This is problematic

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

Am 18.07.2015 um 17:21 schrieb Ben Walton: The space following the last / in a sed command caused Solaris' xpg4/sed to fail, claiming the program was garbled and exit with status 2: % echo 'foo' | /usr/xpg4/bin/sed -e 's/foo/bar/ ' sed: command garbled: s/foo/bar/ % echo $? 2 Fix this by

Re: [PATCH 3/3] Fix sed usage in tests to work around broken xpg4/sed on Solaris

Am 19.07.2015 um 20:00 schrieb Ben Walton: - sed -e s/CHANGE_ME/change_me/ file file+ + perl -pne s/CHANGE_ME/change_me/ file file+ Did you mean '-lpe' or better '-pe' here? -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2] gitk: Add a Copy commit summary command

Am 16.07.2015 um 17:29 schrieb Beat Bolli: When referring to earlier commits in commit messages or other text, one of the established formats is abbrev-sha (summary, author-date) Add a Copy commit summary command to the context menu that puts this text for the currently selected commit on

Re: [PATCH] check_and_freshen_file: fix reversed success-check

Am 08.07.2015 um 23:03 schrieb Johannes Sixt: Am 08.07.2015 um 20:33 schrieb Jeff King: ...or maybe in the utime() step there is actually a bug, and we report failure for no good reason. Ugh. Ah! That code is less than a year old. When I began to adopt a workflow requiring force-pushes lately

Re: Git force push fails after a rejected push (unpack failed)?

Am 07.07.2015 um 21:49 schrieb Jeff King: On Tue, Jul 07, 2015 at 09:31:25PM +0200, X H wrote: For the moment, I'm the only one pushing to the remote, always with the same user (second user is planned). I use git-for-windows which is based on MSYS2. I have mounted the network share with noacl

Re: [PATCH v7 2/8] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

Am 08.07.2015 um 02:55 schrieb David Turner: Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD and REVERT_HEAD. Signed-off-by: David Turner dtur...@twopensource.com --- ... diff --git a/contrib/completion/git-prompt.sh

Re: [PATCH v7 2/8] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

Am 08.07.2015 um 21:16 schrieb David Turner: On Wed, 2015-07-08 at 19:46 +0200, Johannes Sixt wrote: Am 08.07.2015 um 02:55 schrieb David Turner: Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD and REVERT_HEAD. Signed-off

Re: [PATCH] check_and_freshen_file: fix reversed success-check

Am 08.07.2015 um 20:33 schrieb Jeff King: ...or maybe in the utime() step there is actually a bug, and we report failure for no good reason. Ugh. Ah! That code is less than a year old. When I began to adopt a workflow requiring force-pushes lately, I wondered why I haven't seen these

Re: [PATCH 12/12] t3901: test git-am encoding conversion

Am 02.07.2015 um 20:16 schrieb Paul Tan: Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am supported the --utf8 and --no-utf8 options, and if set, would pass the -u flag and the -k flag respectively. git mailinfo -u will re-code the commit log message and authorship info in

Re: Git force push fails after a rejected push (unpack failed)?

Am 08.07.2015 um 20:05 schrieb Jeff King: We also don't write objects directly, of course; we write to a temporary file and try to link them into place. It really sounds more like the objects/d9 directory is where the permission problems are. But, hmm... Not on Windows: A read-only file cannot

Re: [PATCH v2] fetch-pack: optionally save packs to disk

Am 11.06.2015 um 20:59 schrieb Augie Fackler: When developing server software, it's often helpful to save a potentially-bogus pack for later analysis. This makes that trivial, instead of painful. When you develop server software, shouldn't you test drive the server via the bare metal protocol

Re: [PATCH 03/14] lockfile: remove some redundant functions

Am 10.06.2015 um 19:40 schrieb Junio C Hamano: Michael Haggerty mhag...@alum.mit.edu writes: Remove the following functions and rewrite their callers to use the equivalent tempfile functions directly: * fdopen_lock_file() - fdopen_tempfile() * reopen_lock_file() - reopen_tempfile() *

[PATCH 4/4] lockfile: wait using sleep_millisec() instead of select()

Use the new function sleep_millisec() to delay execution for a short time. This avoids the invocation of select() with just a timeout, but no file descriptors. Such a use of select() is quit with EINVAL on Windows, leading to no delay at all. Signed-off-by: Johannes Sixt j...@kdbg.org

[PATCH 2/4] help.c: wrap wait-only poll() invocation in sleep_millisec()

We want to use the new function elsewhere in a moment. Signed-off-by: Johannes Sixt j...@kdbg.org --- cache.h | 1 + help.c| 2 +- wrapper.c | 5 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 54f108a..328cdb7 100644 --- a/cache.h +++ b/cache.h

[PATCH 3/4] lockfile: convert retry timeout computations to millisecond

When the goal is to wait for some random amount of time up to one second, it is not necessary to compute with microsecond precision. This is a preparation to re-use sleep_millisec(). Signed-off-by: Johannes Sixt j...@kdbg.org --- lockfile.c | 21 - 1 file changed, 8

[PATCH 1/4] lockfile: replace random() by rand()

On Windows, we do not have functions srandom() and random(). Use srand() and rand(). These functions produce random numbers of lesser quality, but for the purpose (a retry time-out) they are still good enough. Signed-off-by: Johannes Sixt j...@kdbg.org --- This is the same version I posted

[PATCH 0/4] Fix file locking with retry and timeout on Windows

because a select() call where all three sets of file descriptors are empty is not supported on Windows. Johannes Sixt (4): lockfile: replace random() by rand() help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: convert retry timeout computations to millisecond lockfile

Re: [PATCH mh/lockfile-retry] lockfile: replace random() by rand()

Am 30.05.2015 um 19:12 schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: There you have it: Look the other way for a while, and people start using exotic stuff... ;) Is it exotic to have random/srandom? Both are in POSIX and 4BSD; admittedly rand/srand are written down in C89

[PATCH mh/lockfile-retry] lockfile: replace random() by rand()

On Windows, we do not have functions srandom() and random(). Use srand() and rand(). These functions produce random numbers of lesser quality, but for the purpose (a retry time-out) they are still good enough. Signed-off-by: Johannes Sixt j...@kdbg.org --- There you have it: Look the other way

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