Re: config for `format-patch --notes`?

Thanks for the reply. I did not knew that branch descriptions automatically make it in the cover letter. Learned something new! Unfortunately this would still mean I have to manually add the branch name to the branch description. I will try to create a patch for adding a config option for the

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

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

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

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

builtin difftool parsing issue

Sadly, I haven't been able to figure out how to get the mbox file from this tread into gmail, but wanted to report a parsing issue I've found with the builtin difftool. Original Patch:

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Wed, Dec 21, 2016 at 07:53:15PM -0800, Kyle J. McKay wrote: > It seems to me what you are saying is that Git's "assert" calls are > DIAGNOSTIC and therefore belong in a release build -- well, except for the > nedmalloc "assert" calls which do not. Yes, I think that is a good way of thinking

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 21, 2016, at 18:21, Kyle J. McKay wrote: On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume most people

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Wed, Dec 21, 2016 at 06:21:37PM -0800, Kyle J. McKay wrote: > > Kind of. If it's a configuration that nobody[1] in the Git development > > community intended to support or test, then isn't the person triggering > > it the one making assumptions? > > No, I don't think so. NDEBUG is very

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 21, 2016, at 07:55, Jeff King wrote: On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: I wasn't aware anybody actually built with NDEBUG at all. You'd have to explicitly ask for it via CFLAGS, so I assume most people don't. Not a good assumption. You know what happens

Re: References to old messages

Stephen & Linda Smith wrote: > I had been told to reference (i.e. footnote) a gmane URL. With that service > no longer being being online, what is the preferred method footnoting? What the others said about Message-IDs and public-inbox :) If you only have old URLs pointing to

Re: config for `format-patch --notes`?

On Wed, Dec 21, 2016 at 1:18 AM, Norbert Kiesel wrote: > Hi, > > I use `git format-patch master..myBranch` quite a bit to send patches > to other developers. I also add notes to the commits > so that I e.g. remember which patches were emailed to whom. `git log` > has an

What's cooking in git.git (Dec 2016, #06; Wed, 21)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: References to old messages

Stephen & Linda Smith writes: > I want to pick up work on a patch that I was working on previously. > > I had been told to reference (i.e. footnote) a gmane URL. With that service > no longer being being online, what is the preferred method footnoting? > > sps The NNTP

Re: References to old messages

On Wed, Dec 21, 2016 at 3:12 PM, Stephen & Linda Smith wrote: > I want to pick up work on a patch that I was working on previously. > > I had been told to reference (i.e. footnote) a gmane URL. With that service > no longer being being online, what is the preferred method

References to old messages

I want to pick up work on a patch that I was working on previously. I had been told to reference (i.e. footnote) a gmane URL. With that service no longer being being online, what is the preferred method footnoting? sps

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

On Wed, Dec 21, 2016 at 10:33:43PM +0100, Johannes Sixt wrote: > Protect a recently added test case with !MINGW. > > Signed-off-by: Johannes Sixt > --- > I don't remember why I did not notice this failure sooner. > Perhaps I did, but then ran out of time to debug it... > >

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

On 12/21, Johannes Sixt wrote: > When an absolute path is resolved, resolution begins at the first path > component after the root part. The root part is just copied verbatim, > because it must not be inspected for symbolic links. For POSIX paths, > this is just the initial slash, but on Windows,

Re: Bug report: Git pull hang occasionally

I will verify it. Thanks. > On Dec 21, 2016, at 1:32 PM, Junio C Hamano wrote: > > Junio C Hamano writes: > >> And the unexpected discrepancy is reported by find_symref() as >> fatal. The server side dies, and somehow that fact is lost between >> the

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

When an absolute path is resolved, resolution begins at the first path component after the root part. The root part is just copied verbatim, because it must not be inspected for symbolic links. For POSIX paths, this is just the initial slash, but on Windows, the root part has the forms c:\ or

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

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

Re: Bug report: Git pull hang occasionally

Junio C Hamano writes: > And the unexpected discrepancy is reported by find_symref() as > fatal. The server side dies, and somehow that fact is lost between > the upload-pack process and the client and somebody in the middle > (e.g. fastcgi interface or nginx webserver on the

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

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

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

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

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

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

Re: Bug report: Git pull hang occasionally

Thank you for your insight and detailed explanation Junio. I think what you said is what is happening in my environment. Both writing and reading are happening simultaneously. > On Dec 21, 2016, at 12:59 PM, Junio C Hamano wrote: > > Kai Zhang writes:

Re: Races on ref .lock files?

Andreas Krey writes: > In a different instance, we have a simple bare git repo that we > use for backup purposes. Which means there are lots of pushes > going there (all to disjunct refs), and I now cared to look > into those logfiles: > > snip > Wed Dec 21 05:08:14 CET 2016 >

Re: Bug report: Git pull hang occasionally

Kai Zhang writes: > 2016/12/20 20:38:10 [error] 9957#0: *687703 FastCGI sent in stderr: "fatal: > 'HEAD' is a symref but it is not?" while reading response header from > upstream, client: 10.1.0.11, server: server, request: "POST > /git/repo_name/.git/git-upload-pack

Re: [PATCH] string-list: make compare function compatible with qsort(3)

Junio C Hamano writes: > I do agree that non-reentrancy is an issue that is worth solving, > though. I sounded overly negative, but I do not think of any way other than this patch to solve the reentrancy issue without using qsort_s(). Between the two, my preference is still

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

Jeff King writes: > I do wonder if in general it should be the responsibility of skippable > tests to make sure we end up with the same state whether they are run or > not. That might manage the complexity more. But I certainly don't mind > tests being defensive like you have

Bug report: Git pull hang occasionally

Issue: Git pull hang occasionally, and when git pull start hanging, need manually "kill -9" to stop hanging Environment: Server side: Git version: 2.11.0 OS: ubuntu 12.04 Nginx: 1.9.7.4 fcgiwrap: 1.1.0 Git repo: None bare, small size (less than 5 MB including .git folder), small file number

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On 2016-12-20 07:05 PM, Michael Haggerty wrote: On 12/20/2016 04:01 PM, Marc Branchaud wrote: On 2016-12-19 11:44 AM, Michael Haggerty wrote: This patch series changes a bunch of details about how remote-tracking references are rendered in the commit list of gitk: Thanks for this! I like

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

Johannes Schindelin writes: > I prepared a patch series based on `pu`, on top of Hannes' patch, and I > also prepared a branch that is based on `master`, obviously without > Hannes' patch. I think the latter is what you have at $ git fetch

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

Johannes Schindelin writes: > From: Jeff Hostetler > > For over a year, Git for Windows has carried a patch that detects the > MSYS2 pseudo ttys used by Git for Windows' default Git Bash (i.e. a > terminal that is not backed by a Win32

Re: [PATCH] string-list: make compare function compatible with qsort(3)

René Scharfe writes: > The cmp member of struct string_list points to a comparison function > that is used for sorting and searching of list items. It takes two > string pointers -- like strcmp(3), which is in fact the default; > cmp_items() provides a qsort(3) compatible

Missing option for format-patch?

Hi, I use `git format-patch master..myBranch` quite a bit to send patches to other developers. I also add notes to the commits so that I remember which patches were emailed to whom. `git log` has an option to automatically include the notes in the output. However, I can't find such an option

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

Hi Junio, On Tue, 20 Dec 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > That code works because winansi_get_osfhandle() is in winansi.c, where its > > call to isatty() is *not* redirected to winansi_isatty(). Good. > > ... > > My plan was actually

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

Hi Hannes, On Mon, 19 Dec 2016, Johannes Sixt wrote: > 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

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

Hi, On Fri, 16 Dec 2016, Junio C Hamano wrote: > Johannes Sixt writes: > > > 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

[PATCH 1/2] mingw: adjust is_console() to work with stdin

When determining whether a handle corresponds to a *real* Win32 Console (as opposed to, say, a character device such as /dev/null), we use the GetConsoleOutputBufferInfo() function as a tell-tale. However, that does not work for *input* handles associated with a console. Let's just use the

[PATCH 2/2] mingw: replace isatty() hack

From: Jeff Hostetler For over a year, Git for Windows has carried a patch that detects the MSYS2 pseudo ttys used by Git for Windows' default Git Bash (i.e. a terminal that is not backed by a Win32 Console). This patch accesses internals that of a previous MSVC runtime

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

My previous fix may have fixed running the new t/t6030-bisect-porcelain.sh script that tested the new bisect--helper, which in turn used isatty() to determine whether it was running interactively and was fooled by being redirected to /dev/null. But it not only broke paging when running in a CMD

Re: [PATCH] string-list: make compare function compatible with qsort(3)

On Wed, Dec 21, 2016 at 10:36:41AM +0100, René Scharfe wrote: > One shortcoming is that the comparison function is restricted to working > with the string members of items; util is inaccessible to it. Another > one is that the value of cmp is passed in a global variable to > cmp_items(), making

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

On Tue, Dec 20, 2016 at 11:55:45PM -0800, Jacob Keller wrote: > > I do wonder if in general it should be the responsibility of skippable > > tests to make sure we end up with the same state whether they are run or > > not. That might manage the complexity more. But I certainly don't mind > >

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Tue, Dec 20, 2016 at 09:54:15PM -0800, Kyle J. McKay wrote: > > I wasn't aware anybody actually built with NDEBUG at all. You'd have to > > explicitly ask for it via CFLAGS, so I assume most people don't. > > Not a good assumption. You know what happens when you assume[1], right? ;) Kind

Re: Races on ref .lock files?

On Fri, 16 Dec 2016 09:20:07 +, Junio C Hamano wrote: ... > > error: cannot lock ref 'stash-refs/pull-requests/18978/to': Unable to > > create > > '/opt/apps//repositories/68/stash-refs/pull-requests/18978/to.lock': > > File exists. ... > I think (and I think you also think) these

[PATCH] string-list: make compare function compatible with qsort(3)

The cmp member of struct string_list points to a comparison function that is used for sorting and searching of list items. It takes two string pointers -- like strcmp(3), which is in fact the default; cmp_items() provides a qsort(3) compatible interface by passing the string members of two struct

Re: [PATCH 1/3] compat: add qsort_s()

Am 12.12.2016 um 20:57 schrieb Jeff King: On Mon, Dec 12, 2016 at 08:51:14PM +0100, René Scharfe wrote: It's kinda cool to have a bespoke compatibility layer for major platforms, but the more I think about it the less I can answer why we would want that. Safety, reliability and performance

Re: Races on ref .lock files?

On Fri, 16 Dec 2016 15:34:22 +, Bryan Turner wrote: ... > Bitbucket Server developer here. Social media rock. :-) > If you'd like to investigate more in depth, I'd encourage you to > create a ticket on support.atlassian.com so we can work with you. That is going to be postponed until we