Hi Junio,
On Tue, 2 Aug 2016, Junio C Hamano wrote:
> So either I should change my workflow and mention any and all
> typofixes in my review comments (which consumes the review
> bandwidth), or I should force patch authors to do the "fetch from
> 'pu' and replace" somehow to avoid this kind of ba
Hi Hannes,
On Wed, 3 Aug 2016, Johannes Sixt wrote:
> This fell through the cracks, I think. I marked it as v2 because
> there is a minor fixup in the commit message.
It appears that it did fall through the cracks.
Given that it would make my life substantially easier (because I run the
test
per se, as Git has no concept of hard links.
Signed-off-by: Johannes Schindelin
---
Published-As: https://github.com/dscho/git/releases/tag/import-tars-hardlink-v1
contrib/fast-import/import-tars.perl | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
di
Hi Jon,
On Wed, 3 Aug 2016, jonsm...@gmail.com wrote:
> I'm working with some Windows programmers that don't believe in file
> permissions They keep sending me zip files of their source tree. I
> have my copy of the tree in git on Linux with all of the correct file
> permissions.
>
> So I unzip
Hi Christian,
On Wed, 3 Aug 2016, Christian Couder wrote:
> Now there are different options to fix this:
>
> 1) remove the symbols in 9f87c22 ("apply: refactor `git apply` option
> parsing") at the end of the series, or
> 2) move 4820e13 (apply: make some parsing functions static again) at
> the
Hi Chris,
On Wed, 3 Aug 2016, Chris Packham wrote:
> This is similar to the existing "reword" command in that it can be used
> to update the commit message the difference is that the editor presented
> to the user for the commit. It provides a useful shorthand for "exec git
> commit --amend --no-
Hi Jeremy,
On Wed, 3 Aug 2016, Jeremy Huddleston Sequoia wrote:
> I have two test failures to report in git 2.9.2 on macOS:
>
>
> t3210-pack-refs.sh has not changed between 2.8.4 and 2.9.2. This test passed
> fine with 2.8.4, but it now fails with 2.9.2 at:
>
> not ok 26 - retry acquiring pa
Hi Junio,
On Tue, 2 Aug 2016, Jeff Hostetler wrote:
> This patch series adds porcelain V2 format to status.
> This provides detailed information about file changes
> and about the current branch.
>
> The new output is accessed via:
> git status --porcelain=v2 [--branch]
I was wondering... t
Hi Chris,
On Wed, 3 Aug 2016, Johannes Schindelin wrote:
> I can understand how this "sign" command helps you. I myself wished for
> new commands when working on my Git garden shears [*1*] (essentially, what
> git rebase --interactive --preserve-merges *should* have been
Hi Santiago,
On Wed, 3 Aug 2016, Santiago Torres wrote:
> I'm open for feedback and corrections. If anything seems odd imprecise
> to the community, I can make an errata in the presentation (at least).
> I'll also try to work towards making corrections anywhere if possible;
> this is my first pub
Hi Junio,
On Wed, 3 Aug 2016, Junio C Hamano wrote:
> On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin
> wrote:
> >
> > I disagree, however, with the suggestion to sift through your `pu` branch
> > and to somehow replace local branches with the commits found there.
Hi Junio,
On Wed, 3 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > ... my Git garden shears [*1*] (essentially, what
> > git rebase --interactive --preserve-merges *should* have been).
>
> Any plan to fold it into "git rebase -i" as a
Hi Junio,
On Wed, 3 Aug 2016, Junio C Hamano wrote:
> On Wed, Aug 3, 2016 at 8:09 AM, Johannes Schindelin
> wrote:
>
> > Any word when it will be included in `pu`, at least?
>
> I've been waiting to see that the amount and quality of
> comments from others indicate
Hi Junio,
On Wed, 3 Aug 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > I do not think negative (or non-zero) return is an "abuse" at all.
> > It is misleading in the context of the function whose name has "cmp"
> > in it, but that is not the fault of this function, rather, the
> > b
Hi Lars & John,
On Thu, 4 Aug 2016, Lars Schneider wrote:
> > On 04 Aug 2016, at 13:32, John Keeping wrote:
> >
> > On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote:
> >>
> >>> * jk/push-force-with-lease-creation (2016-07-26) 3 commits
> >>> - push: allow pushing new branches wit
of the test commits consistent with the previous
test cases: use upper-case, and advance in the alphabet.
This came up in local work to rebase the Windows-specific patches to the
current `next` branch. An identical fix was suggested by John Keeping.
Signed-off-by: Johannes Schindelin
---
Pub
Hi Junio,
On Wed, 3 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > ---
> > Published-As:
> > https://github.com/dscho/git/releases/tag/import-tars-hardlink-v1
>
> A link to a page that lets you download entire source tarball is not
> v
Hi Peff,
On Wed, 3 Aug 2016, Jeff King wrote:
> On Wed, Aug 03, 2016 at 09:53:18AM -0700, Junio C Hamano wrote:
>
> > > Leaving aside Dscho's questions of whether pulling patches from email is
> > > convenient for most submitters (it certainly is for me, but I recognize
> > > that it is not for
Hi Stefan,
On Wed, 3 Aug 2016, Stefan Beller wrote:
> On Wed, Aug 3, 2016 at 9:07 AM, Johannes Schindelin
> wrote:
> >
> > On Wed, 3 Aug 2016, Junio C Hamano wrote:
> >
> >> On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin
> >> wrote:
> >>
While working on some local setup to allow my poor little laptop to
build and test the Windows-specific patches of Git for Windows on top of
the upstream branches, my development environment updated to use GCC 6,
and these patches were required.
Johannes Schindelin (2):
nedmalloc: fix
Some code in nedmalloc is indented in a funny way that could be
misinterpreted as if a line after a for loop was included in the loop
body, when it is not.
GCC 6 complains about this in DEVELOPER=YepSure mode.
Signed-off-by: Johannes Schindelin
---
compat/nedmalloc/nedmalloc.c | 8
1
that
now because it thinks that NULL cannot be passed to strdup() anyway.
Let's just shut up GCC >= 6 in that case and go on with our lives.
See https://gcc.gnu.org/gcc-6/porting_to.html for details.
Signed-off-by: Johannes Schindelin
---
compat/nedmalloc/nedmalloc.c | 3 +++
1 file ch
Hi Stefan,
On Thu, 4 Aug 2016, Stefan Beller wrote:
> On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin
> wrote:
> >
> >> If we were to change our workflows drastically, I'd propose to go a
> >> way[1] similar to notedb in Gerrit, or git-series,
> &
Hi Eric,
On Thu, 4 Aug 2016, Eric Wong wrote:
> Stefan Beller wrote:
> > On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin
> > wrote:
> > > I guess I have no really good idea yet, either, how to retain the ease of
> > > access of sending mails to the list, y
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The newly-added test case wants to commit a file "c.t" (note the lower
> > case) when a previous test case already committed a file "C.t". This
> > confuses G
This lets t7001-mv.sh pass in Bash on Windows.
Signed-off-by: Johannes Schindelin
---
There is unfortunately another problem with Git running in Bash on
Windows: the credential cache daemon somehow gets stuck. I guess
this is some timing issue, in more than one way: ri
Hi Duy,
On Fri, 5 Aug 2016, Duy Nguyen wrote:
> On the topic of fixup and squash and everything. Is anyone else
> annoyed that the commit title is taken for fixup!, squash!
> instructions?
I do not know about others, but I am not annoyed by those commit titles. I
think they make tons of sense.
Hi Richard,
On Fri, 5 Aug 2016, Richard Ipsum wrote:
> On Thu, Aug 04, 2016 at 09:42:18AM -0700, Stefan Beller wrote:
> > On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin
> > wrote:
> > >
> > >> If we were to change our workflows drastically, I'd
Hi Junio & René,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Let's try it this way. How about this as a replacement?
I like it (with the if (s2) test intead of if (s1), of course). But please
record René as author, maybe mentioning myself with a "Diagnosed-by:"
line.
FWIW today's `pu` does pas
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > With GCC 6, the strdup() function is declared with the "nonnull"
> > attribute, stating that it is not allowed to pass a NULL value as
> > parameter.
> >
> &g
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Ever since 66a155b (Enable output buffering in merge-recursive.,
> > 2007-01-14), we had a problem: When the merge failed in a fatal way, all
> > regular output was swallowed because
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Jeff King writes:
>
> > Like you, I have occasionally been bitten by Junio doing a fixup, and
> > then I end up re-rolling, and lose that fixup.
>
> ... which usually is caught when I receive the reroll, as I try to apply
> to the same base
Hi Junio,
On Fri, 5 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > When calling `rename("dir", "non-existing-dir/")` on Linux, it silently
> > succeeds, stripping the trailing slash of the second argument.
> >
> > This is a
Hi Peff,
On Wed, 3 Aug 2016, Jeff King wrote:
> On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote:
>
> > > However, I could imagine that we actually want this to be more
> > > extensible. After all, all you are doing is to introduce a new
> > > rebase -i command that does nothing e
Hi Junio,
On Fri, 5 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > This setup will from now on test next & pu in the Git for Windows SDK, and
> > rebase Git for Windows' current master to git.git's maint, master, next &
> > p
Hi Eric,
On Fri, 5 Aug 2016, Eric Wong wrote:
> Johannes Schindelin wrote:
> > On Thu, 4 Aug 2016, Stefan Beller wrote:
> > > git send-email/format-patch recently learned to include a base commit
> >
> > You may have noticed that my mail-patch-series.sh-generate
Hi Philip,
On Fri, 5 Aug 2016, Philip Oakley wrote:
> In the same vein, I always want,with my workflow, to use "fixup!
> ".
Good news for you: this is already supported. See here:
https://github.com/git/git/blob/v2.9.2/git-rebase--interactive.sh#L786-L796
Ciao,
Dscho
--
To unsubscribe from thi
Hi Stefan,
just quickly (i.e. addressing only one point, will try to address more at
a later date) because I want to be mostly offline this weekend:
On Fri, 5 Aug 2016, Stefan Beller wrote:
> On Fri, Aug 5, 2016 at 1:20 AM, Johannes Schindelin
> wrote:
> >
> > I also hate
Hi Junio,
On Fri, 5 Aug 2016, Junio C Hamano wrote:
> Jeff Hostetler writes:
>
> > if (ce_stage(ce)) {
> > d->index_status = DIFF_STATUS_UNMERGED;
> > d->stagemask |= (1 << (ce_stage(ce) - 1));
> > + /*
> > +
Hi,
On Sat, 6 Aug 2016, Eric Wong wrote:
> Junio C Hamano wrote:
> > Somebody mentioned "configuring it is hard--why does the user have
> > to know SMTP subtleties", and that may be a valid complaint against
> > the primary part of send-email. The solution for that is not to
> > discard it with
Hi René,
On Fri, 5 Aug 2016, René Scharfe wrote:
> Call strbuf_addstr() for adding a simple string to a strbuf instead of
> using the heavier strbuf_addf(). This is shorter and documents the
> intent more clearly.
Looks obviously good, thanks!
Ciao,
Dscho
Hi René,
On Fri, 5 Aug 2016, René Scharfe wrote:
> Initialize a string_list right when it's defined. That's shorter, saves
> a function call and makes it more obvious that we're using the NODUP
> variant here.
Thank you! I guess I never updated the code after the _INIT* macros were
introduced.
Hi René,
On Sat, 6 Aug 2016, René Scharfe wrote:
> Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs
> instead of taking detours through find_unique_abbrev() and its static
> buffer. This is shorter and a bit more efficient.
And less error-prone.
It is also a thing I need to
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> * js/import-tars-hardlinks (2016-08-03) 1 commit
> - import-tars: support hard links
>
> "import-tars" fast-import script (in contrib/) used to ignore a
> hardlink target and replaced it with an empty file, which has been
> corrected to r
Hi René,
On Fri, 5 Aug 2016, René Scharfe wrote:
> static void add_strategies(const char *string, unsigned attr)
> {
> - struct strategy *list = NULL;
> - int list_alloc = 0, list_nr = 0, i;
> -
> - memset(&list, 0, sizeof(list));
> - split_merge_strategies(string, &list, &list_
Hi Peff,
On Mon, 8 Aug 2016, Jeff King wrote:
> On Fri, Aug 05, 2016 at 04:19:08PM +0200, Johannes Schindelin wrote:
>
> > > The fix is meant for jk/push-force-with-lease-creation topic, but I
> > > had to find it out by the old fashioned way, i.e. running blame for
>
Hi Torsten,
I remember that you did a ton of work on t0027. Now I see problems, and
not only that the entire script now takes a whopping 4 minutes 20 seconds
to run on my high-end Windows machine.
It appears that t0027 fails randomly for me, in seemingly random places.
Sometimes all 1388 cases pa
Hi Torsten,
On Mon, 8 Aug 2016, Torsten Bögershausen wrote:
> On 2016-08-08 17.05, Johannes Schindelin wrote:
> >
> > I remember that you did a ton of work on t0027. Now I see problems,
> > and not only that the entire script now takes a whopping 4 minutes 20
> > se
Hi Peff,
On Tue, 9 Aug 2016, Jeff King wrote:
> And indeed, this seems to fix it for me (at least it has been running in
> a 16-way loop for 5 minutes, whereas before it died after 30 seconds or
> so):
>
> diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
> index 2860d2d..9f057ff 100755
>
Hi Peff,
On Mon, 8 Aug 2016, Jeff King wrote:
> I got failure within about 30 seconds on t0027 (though 5 minutes? Yeesh.
> It runs in 9s on my laptop. I weep for you).
Yep. That is the price I (and all other Git for Windows developers) pay
for the decision to implement Git's entire test suite in
Hi Junio,
On Mon, 8 Aug 2016, Junio C Hamano wrote:
> Lars Schneider writes:
>
> > 4.) Reviewing patches is super hard for me because my email client
> > does not support patch color highlighting and I can't easily expand
> > context or look at the history of code touched by the patch (e.g via
Hi Junio,
On Mon, 8 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > I think you both got it wrong. The original citizens were the mail
> > clients that allowed you to communicate with other human beings.
> > ... It is our usage to transport machine-r
Hi Michael,
On Tue, 9 Aug 2016, Michael Haggerty wrote:
> On 08/04/2016 05:58 PM, Johannes Schindelin wrote:
> > [...]
> > Even requiring every contributor to register with GitHub would be too
> > much of a limitation, I would wager.
> > [...]
>
> Is it *rea
Hi Elijah,
On Tue, 9 Aug 2016, Elijah Newren wrote:
> [... detailed review ...]
>
> So, I think the series looks good.
Thank you very much for this quite thorough review!
> Sorry that I didn't spot any errors.
That's quite alright with me ;-)
Thanks again!
Dscho
--
To unsubscribe from this li
Hi Torsten,
On Tue, 9 Aug 2016, Torsten Bögershausen wrote:
> > git -c core.autocrlf=$crlf add $fname >"${pfx}_$f.err" 2>&1
> >
> > would make more sense. We _know_ that we have to do convert_to_git() in
> > that step because the content is changed. And then you can ignore the
> > warnings fro
Hi Junio,
On Mon, 8 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > I wonder, however, if we could somhow turn things around by
> > introducing something like
> >
> > split_and_do_for_each(item_p, length, string, delimiter)
> >
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> While I think it would make it easier for people to experiment and
> >> build on if the topic is merged to 'next', I am at the same time a
> >> bit re
Hi,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Linus Torvalds writes:
>
> > On Tue, Dec 13, 2016 at 12:38 PM, Junio C Hamano wrote:
> >> Johannes Schindelin writes:
> >>
> >>> +/*
> >>> + * Note that ordering matters in this enum. Not
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Apart from mostly cosmetic patches (and the occasional odd bug that I
> > fixed promptly), I used these patches since mid May to perform all of my
> > interactive rebases. In mid
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > @@ -395,7 +414,10 @@ static int do_recursive_merge(struct commit *base,
> > struct commit *next,
> >
> > if (active_cache_changed &&
> >
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > @@ -1292,7 +1316,12 @@ static int pick_commits(struct todo_list *todo_list,
> > struct replay_opts *opts)
> > struct todo_item *item = todo_list->items + todo_list-&
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > @@ -43,6 +44,20 @@ static GIT_PATH_FUNC(rebase_path_todo,
> > "rebase-merge/git-rebase-todo")
> > */
> > static GIT_PATH_FUNC(rebase_path_author_
Hi Junio,
On Tue, 13 Dec 2016, Junio C Hamano wrote:
> Please have "else if" on the same line as "}" that closes the
> "if (...) {" in the same if/else if/else cascade.
Fixed. This affected quite a few more patches than just this one, and
added two more to this already large patch series.
Ciao,
Hi Hannes,
On Wed, 14 Dec 2016, Johannes Sixt wrote:
> Am 13.12.2016 um 16:29 schrieb Johannes Schindelin:
> > base-commit: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2
> > Published-As: https://github.com/dscho/git/releases/tag/sequencer-i-v2
> > Fetch-It-Via: git fetch https:/
Hi Stephan,
On Sat, 17 Dec 2016, Stephan Beyer wrote:
> On 12/14/2016 08:29 PM, Junio C Hamano wrote:
> > Johannes Schindelin writes:
> >> -/* We will introduce the 'interactive rebase' mode later */
> >> static inline int is_rebase_i(const struct replay
Hi Junio,
On Thu, 15 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index f6e20b142a..271c21581d 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -45,6 +45,35 @@ static GIT_PATH_FUNC(
Hi Peff,
On Thu, 15 Dec 2016, Jeff King wrote:
> On Thu, Dec 15, 2016 at 10:42:53AM -0800, Junio C Hamano wrote:
>
> > > + sprintf((char *)p, "%d", ++count);
> >
> > Do we know the area pointed at p (which is inside buf) long enough
> > not to overflow? If the original were 9 and you i
Hi Junio,
On Thu, 15 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > + strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
> > + while (*message && *message != '\n' && *message != '\r')
> > +
Hi Peff,
On Thu, 15 Dec 2016, Jeff King wrote:
> On Tue, Dec 13, 2016 at 04:30:01PM +0100, Johannes Schindelin wrote:
>
> > + else {
> > + unsigned char head[20];
> > + struct commit *head_commit;
> > + const char *head_message, *
Hi Hannes,
On Tue, 13 Dec 2016, Johannes Sixt wrote:
> Dscho, it looks like this could fix the original report at
> https://github.com/git-for-windows/git/issues/979
Yes, thank you so much for fixing it!
I think your v2 is safe enough to cherry-pick directly into Git for
Windows' `master`.
T
Hi Junio,
On Fri, 16 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The scripted version of the interactive rebase already does that.
>
> Sensible. I was wondering why this wasn't there while reviewing
> 10/34, comparing the two (this is not a
Hi Junio,
On Fri, 16 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > An interactive rebase operates on a detached HEAD (to keep the reflog
> > of the original branch relatively clean), and updates the branch only
> > at the end.
> >
> &
Hi,
On Sat, 17 Dec 2016, Kyle J. McKay wrote:
> Since 6b4b013f18 (mailinfo: handle in-body header continuations,
> 2016-09-20, v2.11.0) mailinfo.c has contained new code with an
> assert of the form:
>
> assert(call_a_function(...))
>
> The function in question, check_header, has side eff
Hi Kyle,
On Mon, 19 Dec 2016, Kyle J. McKay wrote:
> On Dec 19, 2016, at 09:45, Johannes Schindelin wrote:
>
> >ACK. I noticed this problem (and fixed it independently as a part of a
> >huge patch series I did not get around to submit yet) while trying to
> >get Git
Hi Max,
On Mon, 19 Dec 2016, Max Kirillov wrote:
> UNICODE_STRING::Length field means size of buffer in bytes[1], despite
> of buffer itself being array of wchar_t. Because of that terminating
> zero is placed twice as far. Fix it.
This commit message needs to be wrapped at <= 76 columns per row
Hi Hannes,
On Sun, 18 Dec 2016, Johannes Sixt wrote:
> 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
Hi Hannes,
On Sun, 18 Dec 2016, Johannes Sixt wrote:
> What do you think?
>
> diff --git a/compat/winansi.c b/compat/winansi.c
> index ba360be69b..1748d1 100644
> --- a/compat/winansi.c
> +++ b/compat/winansi.c
> @@ -575,9 +575,8 @@ static void detect_msys_tty(int fd)
>
> int winansi_isat
`, 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 mingw-isatty-fixup-master
Jeff Hostetler (1):
mingw: replace isatty() hack
Johannes Schindelin (1):
min
patch
also fixes the previous misguided attempt to intercept isatty() so that
it handles character devices (such as /dev/null) as Git expects it.
Signed-off-by: Jeff Hostetler
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 191 +++
1
16-12-11) that broke everything on
Windows.
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index 5b2f5638ec..97a004b8ab 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@
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 sorry, things happen
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 f
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 actua
Hi Junio,
On Wed, 21 Dec 2016, Junio C Hamano wrote:
> 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.
>
d
replacement
- added the missing white space between ">=" and "0"
Alan Davies (1):
mingw: fix colourization on Cygwin pseudo terminals
Jeff Hostetler (1):
mingw: replace isatty() hack
Johannes Schindelin (1):
mingw: adjust is_console() to wo
Note that pagination is still broken when running Git for Windows from
within Cygwin, as MSYS2's less.exe is spawned (and does not like to
interact with Cygwin's PTY).
This partially fixes https://github.com/git-for-windows/git/issues/267
Signed-off-by: Alan Davies
Signed-off-by: Johanne
fixes the previous attempt to make
isatty() tell that /dev/null is *not* an interactive terminal.
Signed-off-by: Jeff Hostetler
Tested-by: Beat Bolli
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 176 ++-
1 file changed, 69 insertions
16-12-11) that broke everything on
Windows.
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index cb725fb02f..590d61cb1b 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@
Hi Junio,
On Thu, 22 Dec 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > - unsquashed 2/3 which was improperly snuck in before,
>
> As Windows specific changes, I didn't notice these two were independent.
Yeah, sorry, I only realized today that I had sn
Hi Hannes,
On Thu, 22 Dec 2016, Johannes Sixt wrote:
> Am 21.12.2016 um 22:15 schrieb Johannes Sixt:
> > 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.
Hi Hannes,
On Thu, 22 Dec 2016, Johannes Sixt wrote:
> Am 22.12.2016 um 18:09 schrieb Johannes Schindelin:
> > +static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
> > +{
> > + /*
> > +* Create a copy of the original handle associated with fd
> > +
Hi Hannes,
On Thu, 22 Dec 2016, Johannes Sixt wrote:
> Am 22.12.2016 um 07:13 schrieb Johannes Sixt:
> > Am 21.12.2016 um 23:42 schrieb Jeff King:
> > > Hmph. I explicitly avoided a colon in the filename so that it would
> > > run on MINGW. Is a double-quote also not allowed?
> >
> > It is not al
Hi Stefan,
On Thu, 22 Dec 2016, Stefan Beller wrote:
> This is a small hack that adds the diffstat to the interactive rebase
> helping me a bit during the rebase, such that:
>
> $ git rebase -i HEAD^^
>
> pick 2eaa3f532c Third batch for 2.12
> # Documentation/RelNotes/2.12.0.txt | 4
Hi Stefan,
On Thu, 22 Dec 2016, Stefan Beller wrote:
> *Ideally* I would rather have a different formatting, e.g. maybe:
>
> $ git checkout remotes/origin/js/sequencer-wo-die
> $ git rebase -i --new-magic v2.10.0-rc2^
>
> which produces:
>
> pick d5cb9cbd64 Git 2.10-rc2
Hi Daniel,
On Thu, 22 Dec 2016, Daniel Chumak wrote:
> Is there a reason why there is no '--no-edit' option for git rebase? I would
> like to use this option after editing a commit and continuing the current
> interactive rebase without having to change the commit message.
Why not
git c
is not used afterwards anyway
- generated the patches with --patience in the hope to improve
readability
Alan Davies (1):
mingw: fix colourization on Cygwin pseudo terminals
Jeff Hostetler (1):
mingw: replace isatty() hack
Johannes Schindelin (1):
mingw: adjust is_console() to work
Note that pagination is still broken when running Git for Windows from
within Cygwin, as MSYS2's less.exe is spawned (and does not like to
interact with Cygwin's PTY).
This partially fixes https://github.com/git-for-windows/git/issues/267
Signed-off-by: Alan Davies
Signed-off-by: Johanne
16-12-11) that broke everything on
Windows.
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index cb725fb02f..590d61cb1b 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@
fixes the previous attempt to make
isatty() tell that /dev/null is *not* an interactive terminal.
Signed-off-by: Jeff Hostetler
Tested-by: Beat Bolli
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 181 +--
1 file changed, 70 insertions
Hi Hannes,
On Thu, 22 Dec 2016, Johannes Sixt wrote:
> Am 22.12.2016 um 22:37 schrieb Johannes Schindelin:
>
> > Would you have a suggestion how to rephrase the comment to make it
> > less confusing?
>
> Perhaps
>
>* This might close the cached console ha
701 - 800 of 7666 matches
Mail list logo
