Re: [PATCHv8 6/6] submodule: add absorb-git-dir function

On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote: > diff --git a/dir.c b/dir.c > index e0efd3c2c3..d872cc1570 100644 > --- a/dir.c > +++ b/dir.c > @@ -2773,3 +2773,15 @@ void connect_work_tree_and_git_dir(const char > *work_tree_, const char *git_dir_) > free(work_tree); >

[PATCH] fast-import: properly fanout notes when tree is imported

In typical uses of fast-import, trees are inherited from a parent commit. In that case, the tree_entry for the branch looks like: .versions[1].sha1 = $some_sha1 .tree = However, when trees are imported, rather than inherited, that is not the case. One can import a tree with a filemodify

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

Johannes Sixt writes: > .. > The new isatty() override implemented by cbb3f3c9b197 (mingw: intercept > isatty() to handle /dev/null as Git expects it, 2016-12-11) does not > take into account that _get_osfhandle() returns the handle visible by > the C code, which is the pipe. But

Re: Suggestion for the "Did you mean this?" feature

On Mon, Dec 19, 2016 at 1:18 AM, Kaartic Sivaraam wrote: > Hello all, > > I have found the "Did you mean this?" feature of git as a very good > feature. I thought it would be even better if it took a step toward by > asking for a prompt when there was only one

Re: Bug report: $program_name in error message

>> To reproduce, run 'git submodule' from within a bare repo. Result: >> >> $ git submodule >> fatal: $program_name cannot be used without a working tree. >> >> Looks like the intent was for $program_name to be interpolated. > > Which version of git do you use? $ git version git version 2.11.0

Re: Bug report: $program_name in error message

On Sun, Dec 18, 2016 at 12:36 PM, Josh Bleecher Snyder wrote: > To reproduce, run 'git submodule' from within a bare repo. Result: > > $ git submodule > fatal: $program_name cannot be used without a working tree. > > Looks like the intent was for $program_name to be

Bug report: $program_name in error message

To reproduce, run 'git submodule' from within a bare repo. Result: $ git submodule fatal: $program_name cannot be used without a working tree. Looks like the intent was for $program_name to be interpolated. As an aside, I sent a message a few days ago about a segfault when working with a

[PATCH v1] git-p4: add diff/merge properties to .gitattributes for GitLFS files

From: Lars Schneider The `git lfs track` command generates a .gitattributes file with diff and merge properties [1]. Set the same .gitattributes format for files tracked with GitLFS in git-p4. [1]

[PATCH v1] git-p4: fix git-p4.pathEncoding for removed files

From: Lars Schneider In a9e38359e3 we taught git-p4 a way to re-encode path names from what was used in Perforce to UTF-8. This path re-encoding worked properly for "added" paths. "Removed" paths were not re-encoded and therefore different from the "added" paths.

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

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

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

The code in winansi.c emulates ANSI escape sequences when Git is connected to the "real" windows console, CMD.exe. The details are outline in eac14f8909d9 (Win32: Thread-safe windows console output, 2012-01-14). Essentially, it plugs a pipe between C code and the actual console output handle.

Re: Suggestion for the "Did you mean this?" feature

On 18 December 2016 at 14:18, Kaartic Sivaraam wrote: > Hello all, > > I have found the "Did you mean this?" feature of git as a very good > feature. I thought it would be even better if it took a step toward by > asking for a prompt when there was only one alternative to the command > that was

Re: Suggestion for the "Did you mean this?" feature

On Sun, 2016-12-18 at 14:16 +0100, Stephan Beyer wrote: > I cannot tell if this is a good idea (or why it would be a bad idea) > but > why do you restrict your suggestion to the case when there is only > one > alternative? > > Why not also something like: > > --- > $ git sta > git: 'sta' is not

Re: Suggestion for the "Did you mean this?" feature

Hi, On 12/18/2016 01:18 PM, Kaartic Sivaraam wrote: > I have found the "Did you mean this?" feature of git as a very good > feature. I thought it would be even better if it took a step toward by > asking for a prompt when there was only one alternative to the command > that was entered. > >

Re: [RFC/PATCH v3 00/16] Add initial experimental external ODB support

> On 13 Dec 2016, at 18:20, Christian Couder wrote: > > On Sat, Dec 3, 2016 at 7:47 PM, Lars Schneider > wrote: >> >>> On 30 Nov 2016, at 22:04, Christian Couder >>> wrote: >>> >>> Goal >>> >>> >>> Git

[PATCH v1] t0021: fix flaky test

From: Lars Schneider t0021.15 creates files, adds them to the index, and commits them. All this usually happens in a test run within the same second and Git cannot know if the files have been changed between `add` and `commit`. Thus, Git has to run the clean filter in

Re: [PATCH v2 1/5] doc: add documentation for OPT_STRING_LIST

On December 17, 2016 3:56:19 AM PST, Philip Oakley wrote: >From: "Jacob Keller" >> From: Jacob Keller >> >> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", >> 2011-06-09) added the OPT_STRING_LIST as a way

Suggestion for the "Did you mean this?" feature

Hello all, I have found the "Did you mean this?" feature of git as a very good feature. I thought it would be even better if it took a step toward by asking for a prompt when there was only one alternative to the command that was entered.  E.g. > unique@unique-pc:~$ git hepl > git: 'hepl' is