Am 29.06.2016 um 03:43 schrieb Jeff King:
Another is to just put the posix/ksh schemes into the helper function,
and let Windows people sort it out later if they want to.
Let's do this.
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to maj
Am 27.06.2016 um 09:26 schrieb larsxschnei...@gmail.com:
--- a/git-p4.py
+++ b/git-p4.py
@@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
self.useClientSpec_from_options = False
self.clientSpecDirs = None
self.tempBranches = []
-self.tempBranchLocation
Am 25.06.2016 um 07:15 schrieb Barret Rennie:
+--name::
+ Set the name for the worktree. If there is already a worktree with this
What is "the name for the worktree"? Is it the directory where it lives
in? Is it how it is listed with 'git worktree list'?
How is --name different from th
Am 24.06.2016 um 23:05 schrieb Jeff King:
On Fri, Jun 24, 2016 at 10:52:32PM +0200, Johannes Sixt wrote:
The Windows behavior is most closely described as having signal(SIGPIPE,
SIG_IGN) at the very beginning of the program.
Right, but then we would get EPIPE. So what does git do in such
Am 24.06.2016 um 21:43 schrieb Jeff King:
In POSIX shells, a program which exits due to a signal
generally has an exit code of 128 plus the signal number.
However, some platforms do other things. ksh uses 256 plus
the signal number, and on Windows, all signals are just "3".
That's not true, see
Am 24.06.2016 um 18:46 schrieb Jeff King:
On Fri, Jun 24, 2016 at 06:38:55PM +0200, Johannes Sixt wrote:
It's going to be 269 with ksh, and who-knows-what on Windows (due to lack of
SIGPIPE - I haven't tested this, yet).
Thanks, I meant to ask about that. We do a workaround in t00
Am 24.06.2016 um 01:20 schrieb Jeff King:
+# We expect git to die with SIGPIPE here (otherwise we
+# would generate the whole 64GB).
+test_expect_failure BUNZIP 'generate tar with huge size' '
+ {
+ git archive HEAD
+ echo $? >exit-code
+ } | head -c 4096 >
Am 19.06.2016 um 00:13 schrieb brian m. carlson:
* Adjust the Coccinelle patches to transform plain structs before
pointers to structs to avoid misconversions. This addresses the issue
that Peff caught originally.
To avoid future mistakes, can you write down how "transform plain
structs
Am 10.06.2016 um 22:11 schrieb Christian Couder:
--- a/run-command.c
+++ b/run-command.c
@@ -85,7 +85,7 @@ static inline void close_pair(int fd[2])
}
#ifndef GIT_WINDOWS_NATIVE
-static inline void dup_devnull(int to)
+void dup_devnull(int to)
I'm not adding arguments to what we've heard on
Am 10.06.2016 um 13:11 schrieb Johannes Schindelin:
On Fri, 10 Jun 2016, Christian Couder wrote:
On Fri, Jun 10, 2016 at 9:01 AM, Johannes Schindelin
wrote:
I lost track in the meantime: were those issues with unclosed file handles
and unreleased memory in the error code paths addressed system
Am 12.05.2016 um 20:02 schrieb Christian Couder:
On Thu, May 12, 2016 at 7:06 PM, Johannes Sixt wrote:
Am 11.05.2016 um 15:16 schrieb Christian Couder:
This is a patch series about libifying `git apply` functionality, and
using this libified functionality in `git am`, so that no 'git
Am 08.06.2016 um 00:35 schrieb Tom Russello:
Wrap with backticks (monospaced font) unwrapped or single-quotes wrapped
(italic type) environment variables which are followed by the word
"environment". It was obtained with:
perl -pi -e "s/\'?(\\\$?[0-9A-Z\_]+)\'?(?= environment ?)/\`\1\`/g" *.txt
Am 07.06.2016 um 13:50 schrieb Michael Haggerty:
test_update_rejected () {
+ local prefix before pack create error &&
Do we want to add more of unportable 'local' declarations?
prefix="$1" &&
before="$2" &&
pack="$3" &&
-- Hannes
--
To unsubscribe from this
Am 07.06.2016 um 02:57 schrieb brian m. carlson:
Now that this struct's sha1 member is called "oid", update the comment
and the sha1_valid member to be called "oid_valid" instead. The
following Coccinelle semantic patch was used to implement this, followed
by the transformations in standard.cocc
properties)
2. if a line begins with a name in column 1, pick the whole line
Credits to Johannes Sixt (j...@kdbg.org) for the pattern regex and most
of the tests.
Signed-off-by: William Duclot
Signed-off-by: Matthieu Moy
---
Changes since V3:
- Add a few tests
- Remo
Am 03.06.2016 um 08:41 schrieb Matthieu Moy:
Rejecting colon anywhere in the line would also reject valid patterns
like this:
a:hover {
Rejecting it at end of line is probably a good trade-off.
Good point. Could be worth another test case.
-- Hannes
--
To unsubscribe from this list: send th
Am 03.06.2016 um 08:10 schrieb Jeff King:
On Fri, Jun 03, 2016 at 08:05:56AM +0200, Johannes Sixt wrote:
- name=$(pwd)/.gitconfig
+ name=$HOME/.gitconfig
I haven't tested this, yet, but my guess is that this breaks on Windows:
test-config will produce C:/foo style path, bu
Am 03.06.2016 um 00:15 schrieb Junio C Hamano:
When your $PWD does not match $(/bin/pwd), e.g. you have your copy
of the git source tree in one place, point it with a symbolic link,
and then "cd" to that symbolic link before running 'make test', one
of the tests in t1308 expects that the per-user
Am 03.06.2016 um 00:48 schrieb William Duclot:
Logic behind the "pattern" regex is:
The name of the macro parameter is "pattern", but the actual meaning is
"function name" regex.
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e3b1de8..81f60ad 100644
---
Am 01.06.2016 um 00:14 schrieb Jeff King:
> Right, we use the index for reachability checks (both in "prune", but
> also during a "repack -a", which uses the revision parser's
> '--indexed-objects" option). That obviously should handle per-worktree
> index files, but I don't know whether it current
Am 01.06.2016 um 05:31 schrieb Jeff King:
printf '%s' "$1" | sed "s/'/'''/g"
...
export -p | grep "^declare -x $1="
...
"$fake_env_var_=$(shellquote
"$fake_env_orig_")"
...
eval "$fake_env_var_=$(shellquote
Earlier this year I had a largish merge going on in a separate worktree.
With a mix of staged resolutions and unmerged paths in the index, I ran
'git gc' in the main worktree. This removed a lot of objects that were
recorded in that separate worktree index. (I was able to recover them
because t
I think there is logic somewhere in git gc or its minions that gives
expired objects that have been packed a two weeks extra life time as
loose objects.
That is, reachable loose objects are moved to a pack, but those objects
that were packed, but become unreachable due to expired reflogs, are
Therefore, it is wrong to call 'git rerere' from die_with_patch after
"git commit" fails.
Signed-off-by: Johannes Sixt
---
git-rebase--interactive.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9d2bfb7..6e96abc
Am 24.05.2016 um 16:25 schrieb William Duclot:
> +PATTERNS("css",
> + "^([^,{}]+)((,[^}]*\\{)|([ \t]*\\{))$",
This hunk header pattern is a bit too restrictive for my taste. Find
below a few more test cases that you should squash in. One case fails
because only the first CSS selector is picke
Am 24.05.2016 um 00:11 schrieb Junio C Hamano:
Johannes Sixt writes:
However, calling "git rerere" after a failed "git commit" may be
destructive: it would record a resolution even though the commit has
not be completed. Think of an squash commit being aborted because the
u
Am 24.05.2016 um 15:18 schrieb Johannes Schindelin:
Hannes, could you quickly test whether
https://github.com/dscho/git/tree/interactive-rebase calls rerere twice,
too? (Please call interactive rebase with the GIT_USE_REBASE_HELPER=true
to avoid running the interactive rebase twice.)
I have a hu
Am 23.05.2016 um 21:43 schrieb Junio C Hamano:
Johannes Sixt writes:
I'm not sure whether the new behavior is a defect in rerere.c or a
consequence of the extra rerere call in interactive rebase...
Interesting. When running an unnecessary "git rerere" (because it
alre
Even though I operate with jc/rerere-multi for some time now,
I noticed this regression only recently. Watch out for the
duplicated "Recorded preimage" message:
gittest@side:1078> strace -f -o /tmp/git-rebase-conflict.strace git rebase -i
master
error: could not apply 59f92e0... side
When you h
Am 12.05.2016 um 01:32 schrieb Junio C Hamano:
+ if (unlink(filename)) {
+ if (errno == ENOENT)
+ error("no remembered resolution for %s", path);
+ else
+ error("cannot unlink %s: %s", filename,
strerror(errno));
+
seq is not available everywhere.
Signed-off-by: Johannes Sixt
---
t/t6044-merge-unrelated-index-changes.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t6044-merge-unrelated-index-changes.sh
b/t/t6044-merge-unrelated-index-changes.sh
index 20a3ffe..0102348 100755
Am 17.05.2016 um 21:45 schrieb Jeff King:
On Tue, May 17, 2016 at 09:07:33PM +0200, Johannes Sixt wrote:
Am 15.05.2016 um 15:05 schrieb Noam Postavsky:
With a certain topology involving an octopus merge, git log --graph
--oneline --all --color=never produces output which includes some ANSI
Am 15.05.2016 um 15:05 schrieb Noam Postavsky:
With a certain topology involving an octopus merge, git log --graph
--oneline --all --color=never produces output which includes some ANSI
escape code coloring. Attached is a script to reproduce the problem
(creates a git repository in subdir log-for
Am 11.05.2016 um 15:16 schrieb Christian Couder:
This is a patch series about libifying `git apply` functionality, and
using this libified functionality in `git am`, so that no 'git apply'
process is spawn anymore. This makes `git am` significantly faster, so
`git rebase`, when it uses the am bac
Am 11.05.2016 um 23:34 schrieb Junio C Hamano:
Johannes Sixt writes:
As this path is read from a file git itself creates, and if we know
that it will always contain forward slashes, then I agree that it
could be potentially confusing to later readers to see
git_find_last_dir_sep(). So
Am 11.05.2016 um 19:32 schrieb Eric Sunshine:
On Wed, May 11, 2016 at 9:34 AM, Duy Nguyen wrote:
On Wed, May 11, 2016 at 11:43 AM, Eric Sunshine wrote:
On Wed, Apr 13, 2016 at 9:15 AM, Nguyễn Thái Ngọc Duy wrote:
+ if (is_directory(dst.buf)) {
+ const char *sep = strrchr
Am 05.05.2016 um 23:28 schrieb Philip Oakley:
The short and sweet PREFIX can be confused when used in many places.
Rename both usages to better describe their purpose.
Noticed when compiling Git for Windows using MSVC/Visual Studio which
reports the conflict beteeen the command line definition
Am 05.05.2016 um 11:50 schrieb Christian Couder:
On Mon, Apr 25, 2016 at 5:05 PM, Johannes Schindelin
wrote:
Hi Chris,
On Sun, 24 Apr 2016, Christian Couder wrote:
diff --git a/run-command.c b/run-command.c
index 8c7115a..29d2bda 100644
--- a/run-command.c
+++ b/run-command.c
@@ -85,7 +85,7
write() calls return EPIPE when the reader closes the pipe. This is how
write() behaves on Windows.
Signed-off-by: Johannes Sixt
---
compat/mingw.h | 1 +
compat/win32/pthread.h | 5 +
2 files changed, 6 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index a950ae2..0f272fd
Am 27.04.2016 um 22:56 schrieb Junio C Hamano:
So being able to stop at only commits on the first-parent chain is a
valid and useful tool. "git bisect --first-parent" is one of the
things that are sometimes asked for.
With origin pointing to git.git, I attempted this:
git bisect start
git r
Am 27.04.2016 um 08:43 schrieb Johannes Schindelin:
On Tue, 26 Apr 2016, Johannes Sixt wrote:
Should we insert a check for MAP_PRIVATE to catch
unexpected use-cases (think of the index-helper daemon effort)?
I agree, we should have such a check. The line above the `die("Invalid
Am 26.04.2016 um 23:37 schrieb Junio C Hamano:
* The necessary update to avoid end-user mistake would look like
this. I am not queuing this or further working on it myself,
as I am not sure if it is all that useful.
Whoever picks up this patch, be warned that the i18n coding should b
Am 22.04.2016 um 16:31 schrieb Johannes Schindelin:
Often we are mmap()ing read-only. In those cases, it is wasteful to map in
copy-on-write mode. Even worse: it can cause errors where we run out of
space in the page file.
So let's be extra careful to map files in read-only mode whenever
possibl
Am 24.04.2016 um 23:18 schrieb Ævar Arnfjörð Bjarmason:
+test_expect_success 'set up a pre-commit hook in core.hooksPath' '
+ mkdir -p .git/custom-hooks .git/hooks &&
+ write_script .git/custom-hooks/pre-commit <>.git/PRE-COMMIT-HOOK-WAS-CALLED
+EOF
+ cat >.git/hooks/pre-commit
Am 20.04.2016 um 23:47 schrieb Andreas Schwab:
Shaun Jackman writes:
I'd like to insert a commit between two commits without changing
the committer date or author date of that commit or the subsequent
commits.
The easiest way to implement that is to add a graft to redirect the
parent of the
Am 20.04.2016 um 00:49 schrieb Jeff King:
This is our first use of pthread_sigmask, and I think Windows will have
to come up with something for this in compat/. I don't know how SIGPIPE
works there at all, so it's possible that we can just turn this into a
noop. Worst case it could probably block
Am 17.04.2016 um 05:07 schrieb Eric Sunshine:
Hmm, considering that $(...) collapses each whitespace run (including
newlines) down to a single space, I don't see how you could get a
multi-line result.
No, it doesn't. It only removes trailing newlines:
~:1004> frotz=$(echo 1; echo; echo 2; echo
Am 17.04.2016 um 07:59 schrieb Eric Sunshine:
On Sat, Apr 16, 2016 at 12:13:50PM -0400, Michael Rappazzo wrote:
+test_expect_success 'GIT_DIR=../.git, core.bare = false: prefix' '
+ mkdir work &&
+ test_when_finished "rm -rf work" &&
+ test_config -C "$(pwd)"/.git core.bare fal
Am 14.04.2016 um 20:18 schrieb Stefan Beller:
> @@ -298,4 +305,40 @@ 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
>
>
Am 07.04.2016 um 00:11 schrieb David Turner:
+static void share_index(struct index_state *istate, struct shm *is)
+{
+ void *new_mmap;
+ if (istate->mmap_size <= 20 ||
+ hashcmp(istate->sha1,
+ (unsigned char *)istate->mmap + istate->mmap_size - 20) ||
+
Am 05.04.2016 um 19:09 schrieb Junio C Hamano:
Thanks-to: Torsten Bögershausen
I sense NFD disease: The combining diaresis should combine with the o,
not the g. Here is a correct line to copy-and-paste if you like:
Thanks-to: Torsten Bögershausen
-- Hannes
--
To unsubscribe from this li
Am 03.04.2016 um 01:16 schrieb santi...@nyu.edu:
From: Santiago Torres
The verify_signed_buffer comand might cause a SIGPIPE signal when the
gpg child process terminates early (due to a bad keyid, for example) and
git tries to write to it afterwards. Previously, ignoring SIGPIPE was
done on the
Am 03.04.2016 um 08:24 schrieb Mehul Jain:
On Sun, Apr 3, 2016 at 12:20 AM, Johannes Sixt wrote:
Am 02.04.2016 um 19:58 schrieb Mehul Jain:
+for i in --autostash --no-autostash
+do
+ test_expect_success "pull $i (without --rebase) is illegal" '
+ test_must_f
Am 29.03.2016 um 22:05 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> This part of your 45bf3297 (t1300: fix the new --show-origin tests on
>> Windows)
>>
>> @@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing
>> per
&g
Am 30.03.2016 um 07:52 schrieb Johannes Sixt:
Am 29.03.2016 um 21:18 schrieb Johannes Sixt:
It does pass. The reason is that pwd -W generates forward slashes.
It just occurred to me that we might be observing a difference in
behavior of pwd -W between the modern MSYS2 bash and the old MSYS1
Am 02.04.2016 um 19:58 schrieb Mehul Jain:
These two tests are almost similar and thus can be folded in a for-loop.
Helped-by: Eric Sunshine
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/t/t5520-pull.sh b/t
Am 29.03.2016 um 21:18 schrieb Johannes Sixt:
Am 28.03.2016 um 17:14 schrieb Johannes Schindelin:
The problem with your patch is that it does not account for backslashes in
paths resulting in quoting. I am afraid that your patch will most likely
*not* let the tests pass in Git for Windows SDK
Am 28.03.2016 um 17:14 schrieb Johannes Schindelin:
> Hi Hannes,
>
> On Mon, 28 Mar 2016, Johannes Sixt wrote:
>
>> A change like this whould have been preferable:
>> [...]
>
> The problem with your patch is that it does not account for backslashes in
> paths
Am 22.03.2016 um 18:42 schrieb Johannes Schindelin:
> On Windows, the backslash is the native directory separator, but all
> supported Windows versions also accept the forward slash in most
> circumstances.
>
> Our tests expect forward slashes.
>
> Relative paths are generated by Git using forwar
Am 17.03.2016 um 02:19 schrieb Stefan Beller:
-test_expect_success 'rebase --exec without -i shows error message' '
+test_expect_success 'rebase --exec works without -i ' '
git reset --hard execute &&
- set_fake_editor &&
- test_must_fail git rebase --exec "git show HEAD" HEAD
Am 11.03.2016 um 03:57 schrieb Mikael Magnusson:
You can have /usr/src/git/master, /usr/src/git/some-work-tree, etc,
and /usr/src/git itself is not a git repository at all. That way
/usr/src only has one git-related directory and no worktrees are
nested.
I started using separate worktrees recen
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
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 wrote:
8<
Subject: [PATCH] t0001: fix GIT_* environment variable check under --valgrind
When a test case is run without --valgrind, the wrap-
ronment variables
from both expected and actual output.
Signed-off-by: Johannes Sixt
---
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..a5b9e7a 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-i
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
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
>
>
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
This
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
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 purposes, which the user is f
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 b/git-submodule.s
ite_bytes?
---- 8<
From: Johannes Sixt
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
behind the scenes.
Sign
commit message]
Signed-off-by: Johannes Schindelin
Signed-off-by: Johannes Sixt
---
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. But we do get some sort of write failure, no? Otherwise
> h
oduce
only a limited 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
---
This d
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, destina
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 which stalls connect().
Instead of waiting
til.h is included at the top of the file.
Signed-off-by: Johannes Sixt
---
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
@@
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
of line]
Signed-off-by: Johannes Schindelin
Signed-off-by: Johannes Sixt
---
compat/basename.c | 4 +---
compat/mingw.c| 21 -
compat/mingw.h| 5 -
git-compat-util.h | 8
path.c| 14 +-
5 files changed, 30 insertions(+), 22
Am 23.01.2016 um 09:25 schrieb Johannes Schindelin:
Hi Junio,
On Fri, 22 Jan 2016, Junio C Hamano wrote:
Johannes Sixt 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/compat/mingw.c
+++ b
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 th
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 has
e. But with this series applied, all of them are
now resolved automatically and correctly. That's a nice achievement!
Tested-by: Johannes Sixt
I don't have the original submission anymore. So, I'm responding here.
Generally, the patches make sense.
Except for 510936082eb4 &quo
(I'll need to amend with your sign-off even
if this one is satisfactory to you).
-- >8 --
From: Johannes Sixt
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 shell expand 00* and inv
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 trea
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
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 ec
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
following behaviour:
Tha
w_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
Thanks!
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
th
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
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
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
---
lib/merge
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 som
-parallel-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
Thanks,
Stefan
Jonathan Nieder (1):
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, wh
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 majord..
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 settled and then we can
>>> also get the above
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 implic
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 a problem with "dereferences", as "dereference" i
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 HE
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 +++--
3 fil
601 - 700 of 1357 matches
Mail list logo
