Draft of Git Rev News edition 23

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-23.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: [PATCH] difftool.c: mark a file-local symbol with static

On Thu, Dec 01, 2016 at 01:50:57PM -0500, Jeff King wrote: > On Thu, Dec 01, 2016 at 10:20:50AM -0800, Junio C Hamano wrote: > > I also still think that any_printf_like_function("%s", "") looks > > silly. I know that we've already started moving in that direction > > and we stopped at a place we

[PATCH v2 0/7] Macros for Asciidoctor support

There are two major processors of AsciiDoc: AsciiDoc itself, and Asciidoctor. Both have advantages and disadvantages, but traditionally the documentation has been built with AsciiDoc, leading to some surprising breakage when building with Asciidoctor. Partially, this is due to the need to specify

[PATCH v2 1/7] Documentation: fix warning in cat-texi.perl

Newer versions of Perl produce the warning "Unescaped left brace in regex is deprecated, passed through in regex" when an unescaped left brace occurs in a regex. Escape the brace to avoid this warning. Signed-off-by: brian m. carlson ---

[PATCH v2 3/7] Documentation: remove unneeded argument in cat-texi.perl

The newly-added use of the warnings pragma exposes that the $menu[0] argument to printf has long been silently ignored, since there is no format specifier for it. It doesn't appear that the argument is actually needed, either: there is no reason to insert the name of one particular documentation

[PATCH v2 5/7] Documentation: add XSLT to fix DocBook for Texinfo

There are two ways to create a section in a reference document (i.e., manpage) in DocBook 4: refsection elements and refsect, refsect2, and refsect3 elements. Either form is acceptable as of DocBook 4.2, but they cannot be mixed. Prior to DocBook 4.2, only the numbered forms were acceptable.

[PATCH v2 7/7] Makefile: add a knob to enable the use of Asciidoctor

While Git has traditionally built its documentation using AsciiDoc, some people wish to use Asciidoctor for speed or other reasons. Add a Makefile knob, USE_ASCIIDOCTOR, that sets various options in order to produce acceptable output. For HTML output, XHTML5 was chosen, since the AsciiDoc

[PATCH v2 2/7] Documentation: modernize cat-texi.perl

Good style for Perl includes using the strict and warnings pragmas, and preferring lexical file handles over bareword file handles. Using lexical file handles necessitates being explicit when $_ is printed, so that Perl does not get confused and instead print the glob ref. The benefit of this

[PATCH v2 4/7] Documentation: sort sources for gitman.texi

Sorting the sources makes it easier to compare the output using diff. In addition, it aids groups creating reproducible builds, as the order of the files is no longer dependent on the file system or other irrelevant factors. Signed-off-by: brian m. carlson ---

[PATCH v2 6/7] Documentation: move dblatex arguments into variable

Our dblatex invocation uses several style components from the AsciiDoc distribution, but those components are not available when building with Asciidoctor. Move the command line arguments into a variable so it can be overridden by the user or makefile configuration options. Signed-off-by: brian

Re: [PATCH 6/7] Documentation: move dblatex arguments into variable

On 2017-01-21 21:59:11, brian m. carlson wrote: > Our dblatex invocation uses several style components from the AsciiDoc > distribution, but those components are not available when building with > Asciidoctor. Move the command line arguments into a variable so it can > be overridden by the user

Re: [PATCH 1/3] Documentation/stash: remove mention of git reset --hard

On 2017-01-21 20:08:02, Thomas Gummerer wrote: > Don't mention git reset --hard in the documentation for git stash save. > It's an implementation detail that doesn't matter to the end user and > thus shouldn't be exposed to them. > [...] > + Save your local modifications to a new 'stash', and

Re: Idea: Add a filter option to 'git rebase'

From: "Thomas Braun" Friday, January 20, 2017 11:35 PM Am 20.01.2017 um 23:28 schrieb Philip Oakley: A recent question on stackoverflow http://stackoverflow.com/questions/41753252/drop-commits-by-commit-message-in-git-rebase sought to remove automatically commits that could be identified by

[PATCH 5/7] Documentation: add XSLT to fix DocBook for Texinfo

There are two ways to create a section in a reference document (i.e., manpage) in DocBook 4: refsection elements and refsect, refsect2, and refsect3 elements. Either form is acceptable as of DocBook 4.2, but they cannot be mixed. Prior to DocBook 4.2, only the numbered forms were acceptable.

[PATCH 6/7] Documentation: move dblatex arguments into variable

Our dblatex invocation uses several style components from the AsciiDoc distribution, but those components are not available when building with Asciidoctor. Move the command line arguments into a variable so it can be overridden by the user or makefile configuration options. Signed-off-by: brian

[PATCH 2/7] Documentation: modernize cat-texi.perl

Good style for Perl includes using the strict and warnings pragmas, and preferring lexical file handles over bareword file handles. Using lexical file handles necessitates being explicit when $_ is printed, so that Perl does not get confused and instead print the glob ref. The benefit of this

[PATCH 3/7] Documentation: remove unneeded argument in cat-texi.perl

The newly-added use of the warnings pragma exposes that the $menu[0] argument to printf has long been silently ignored, since there is no format specifier for it. It doesn't appear that the argument is actually needed, either: there is no reason to insert the name of one particular documentation

[PATCH 0/7] Macro for Asciidoctor support

There are two major processors of AsciiDoc: AsciiDoc itself, and Asciidoctor. Both have advantages and disadvantages, but traditionally the documentation has been built with AsciiDoc, leading to some surprising breakage when building with Asciidoctor. Partially, this is due to the need to specify

[PATCH 7/7] Makefile: add a knob to enable the use of Asciidoctor

While Git has traditionally built its documentation using AsciiDoc, some people wish to use Asciidoctor for speed or other reasons. Add a Makefile knob, USE_ASCIIDOCTOR, that sets various options in order to produce acceptable output. For HTML output, XHTML5 was chosen, since the AsciiDoc

[PATCH 1/7] Documentation: fix warning in cat-texi.perl

Newer versions of Perl produce the warning "Unescaped left brace in regex is deprecated, passed through in regex" when an unescaped left brace occurs in a regex. Escape the brace to avoid this warning. Signed-off-by: brian m. carlson ---

[PATCH 4/7] Documentation: sort sources for gitman.texi

Sorting the sources makes it easier to compare the output using diff. In addition, it aids groups creating reproducible builds, as the order of the files is no longer dependent on the file system or other irrelevant factors. Signed-off-by: brian m. carlson ---

[PATCH 3/3] stash: support filename argument

While working on a repository, it's often helpful to stash the changes of a single or multiple files, and leave others alone. Unfortunately git currently offers no such option. git stash -p can be used to work around this, but it's often impractical when there are a lot of changes over multiple

[PATCH 1/3] Documentation/stash: remove mention of git reset --hard

Don't mention git reset --hard in the documentation for git stash save. It's an implementation detail that doesn't matter to the end user and thus shouldn't be exposed to them. Signed-off-by: Thomas Gummerer --- Documentation/git-stash.txt | 5 +++-- 1 file changed, 3

[PATCH 0/3] stash: support filename argument

This is the first try to implement the RFC I posted a week ago [1]. It introduces a new push verb for git stash. I couldn't come up with any better name that wasn't already taken. If anyone has ideas I'd be very happy to hear them. Thanks everyone for your input in the previous thread. [1]:

[PATCH 2/3] stash: introduce push verb

Introduce a new git stash push verb in addition to git stash save. The push verb is used to transition from the current command line arguments to a more conventional way, in which the message is specified after a -m parameter instead of being a positional argument. This allows introducing a new

Re: submodule network operations [WAS: Re: [RFC/PATCH 0/4] working tree operations: support superprefix]

On 1/19/2017 7:22 PM, Stefan Beller wrote: Between the init and the update step you can modify the URLs. These commands are just a repetition from the first email, but the git commands can be viewed as moving from one state to another for submodules; submodules itself can be seen as a state

RE: [PATCH] git-p4: Fix git-p4.mapUser on Windows

> On 21 Jan 2017, at 13:33, Lars Schneider > > On 21 Jan 2017, at 13:02, George Vanburgh > wrote: > > > > From: George Vanburgh > > > > When running git-p4 on Windows, with multiple git-p4.mapUser entries > > in git config -

INFO

Hello my name is Ms. Thandi Robert, from Ivory Coast. My parents were brutally mulled by the former president Laurent Gbagbo because of political crisis as the only survival of my family. I got your email while searching for a reliable personality in my private study on the internet. I am in

[PATCH v1] travis-ci: fix Perforce install on macOS

From: Lars Schneider The `perforce` and `perforce-server` package were moved from brew [1][2] to cask [3]. Teach TravisCI the new location. Perforce updates their binaries without version bumps. That made the brew install (legitimately!) fail due to checksum

Re: [RFC PATCH 0/5] Localise error headers

On Wed, Jan 11, 2017 at 09:15:22AM -0800, Stefan Beller wrote: > > That's the assumption I'm challenging. Certainly the behavior and > > certain aspects of the output of a plumbing command should remain the > > same over time. But error messages to stderr? > > In an ideal world that assumption

Re: [RFC PATCH 0/5] Localise error headers

On Wed, Jan 11, 2017 at 10:08:46AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Yes, I would think die_errno() is a no-brainer for translation, since > > the strerror() will be translated. > > > >> apply.c:die(_("internal error")); > >> > >> That is

Re: [RFC PATCH 0/5] Localise error headers

On Fri, Jan 20, 2017 at 08:08:43PM +0700, Duy Nguyen wrote: > > In addition, "BUG: " is relatively recent introduction to our > > codebase. Perhaps having a separate BUG() function help the > > distinction further? > > I was going to write the same thing. On top of that I wonder if have >

Re: [PATCH] log: new option decorate reflog of remote refs

On Sat, Jan 21, 2017 at 07:48:50PM +0700, Duy Nguyen wrote: > OK. Next question, how do we deal with the reflog count (i..e the > argument of --decorate-remote-reflog). Should it be shared for all ref > type, or can be specified differently for remote, local and tags? I'm > leaning towards the

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Sat, Jan 21, 2017 at 07:44:05PM +0700, Duy Nguyen wrote: > You just gave me a reason to rebuild urxvt with perl support. It > solves my problem with SHA-1 nicely (and fixes another problem with > very large counter in my approach, when you scroll git-log further > down, because I can't know

[RFC] what content should go in https://git-scm.com/doc/ext

I'm wondering if anybody has opinions on: https://github.com/git/git-scm.com/pull/924 (and I suspect most people in this community do not read pull requests there, hence this post). Basically, we maintain a list of links to outside documentation, as well as to books. Somebody has requested a

Re: [PATCH] git-p4: Fix git-p4.mapUser on Windows

> On 21 Jan 2017, at 13:02, George Vanburgh wrote: > > From: George Vanburgh > > When running git-p4 on Windows, with multiple git-p4.mapUser entries in > git config - no user mappings are applied to the generated repository. > > Reproduction

[RFC PATCH] Option to allow cherry-pick to skip empty commits

This allows cherry-picking a set of commits, some of which may be redundant, without stopping to ask for the user intervention. Signed-off-by: Giuseppe Bilotta --- Documentation/git-cherry-pick.txt | 4 builtin/revert.c | 1 + sequencer.c

Re: [RFC/PATCH] Disallow commands from within unpopulated submodules.

On Sat, Jan 21, 2017 at 2:17 AM, Jeff King wrote: > On Thu, Jan 19, 2017 at 11:30:23AM -0800, Stefan Beller wrote: > >> Now let's ask the same question for "git -C sub status ." (which is a >> command that is only reading and not writing to the repository) >> >> 1) If the submodule

Re: [PATCH] log: new option decorate reflog of remote refs

On Sat, Jan 21, 2017 at 5:00 AM, Jacob Keller wrote: > On Fri, Jan 20, 2017 at 6:30 AM, Jeff King wrote: >>> Imposing order between options could cause confusion, I think, if you >>> remove --decorate-reflog leaving --remotes on by accident, now you get >>>

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Sat, Jan 21, 2017 at 2:25 AM, Jeff King wrote: > On Fri, Jan 20, 2017 at 11:16:15AM -0800, Jacob Keller wrote: > >> > I recently taught urxvt to recognize sha1s and grab them via keyboard >> > hints, and I'm finding it quite useful. Here's what it looks like if >> > you're

[PATCH] git-p4: Fix git-p4.mapUser on Windows

From: George Vanburgh When running git-p4 on Windows, with multiple git-p4.mapUser entries in git config - no user mappings are applied to the generated repository. Reproduction Steps: 1. Add multiple git-p4.mapUser entries to git config on a Windows machine 2.

[PATCH] rebase: pass --signoff option to git am

Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + git-rebase.sh| 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 67d48e6883..e6f0b93337