On Thu, Dec 22, 2016 at 01:12:12PM -0800, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > I don't think we have too many config options that interact in this
> > way, so I understand that "last writing of a particular configuration"
> > makes sense, but interactions between configs is somethi
On 2016-12-23 02:42, Eric Wong wrote:
> Hi Michael, the patch below should fix things up.
Thank you Eric, I was able to successfully fetch the SVN tag with your
patch applied.
Cheers,
--
Michael Fladischer
Fladi.at
signature.asc
Description: OpenPGP digital signature
Hi Michael, the patch below should fix things up.
Junio: this should go to 'maint', pull request below.
8<---
Subject: [PATCH] git-svn: escape backslashes in refnames
This brings git-svn refname escaping up-to-date with
commit a4c2e69936df8dd0b071b85664c6cc6a4870dd84
Uff, I forgot about the CC of my last reply.
Why not
git commit -C HEAD && git rebase --continue
?
Ciao,
Johannes
Thanks this is a cleaner solution. I guess because I was too fixed upon
knowing of the existence of the no-edit option from other git commands
that I forget about this,
Beat Bolli writes:
>> @@ -84,6 +84,7 @@ static void warn_if_raster_font(void)
>> static int is_console(int fd)
>> {
>> CONSOLE_SCREEN_BUFFER_INFO sbi;
>> +DWORD mode;
>
> Nit: can we move this definition into the block below where it's used?
>
>> HANDLE hcon;
>>
>> static i
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 handle.
>* We must cache t
From: Jeff Hostetler
Git for Windows has carried a patch that depended on internals
of MSVC runtime, but it does not work correctly with recent MSVC
runtime. A replacement was written originally for compiling
with VC++. The patch in this message is a backport of that
replacement, and it also fixe
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 GetCons
From: Alan Davies
Git only colours the output and uses pagination if isatty() returns 1.
MSYS2 and Cygwin emulate pseudo terminals via named pipes, meaning that
isatty() returns 0.
f7f90e0f4f (mingw: make isatty() recognize MSYS2's pseudo terminals
(/dev/pty*), 2016-04-27) fixed this for MSYS2 t
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 wi
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
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
On 22.12.16 18:08, Johannes Schindelin wrote:
> 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* handl
Jacob Keller writes:
>> { OPTION_LOWLEVEL_CALLBACK, 0, "compaction-heuristic", NULL,
>> NULL, N_("Use an experimental blank-line-based heuristic to improve diffs"),
>> PARSE_OPT_NOARG, parse_opt_unknown_cb },
>>
>
> The unchanged context line should have its description re-worde
On Thu, Dec 22, 2016 at 2:35 PM, Daniel Chumak
wrote:
> Is there a reason why there is no '--no-edit' option for git rebase?
Nobody added it so far.
> I would
> like to use this option after editing a commit and continuing the current
> interactive rebase without having to change the commit mess
Stefan Beller writes:
> $ git rebase -i HEAD^^
>
> pick 2eaa3f532c Third batch for 2.12
> # Documentation/RelNotes/2.12.0.txt | 40
> +++
> # 1 file changed, 40 insertions(+)
> pick 3170a3a57b add information to rebase
> # git-rebase--in
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.
Am 22.12.2016 um 22:37 schrieb Johannes Schindelin:
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
+
On Thu, Dec 22, 2016 at 08:06:02PM +0100, 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
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.
Even though I try not to do two "W
On Thu, Dec 22, 2016 at 1:41 PM, Johannes Schindelin
wrote:
> 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 2eaa3
On Thu, Dec 22, 2016 at 1:14 PM, Stefan Monov wrote:
> Hi.
>
> I'd like to use just:
>
> git push
>
> or at most:
>
> git push origin
>
> rather than having to first check which is the active branch with `git
> branch --list`, then type:
>
> git push origin
>
> At [1] and [2] I've see
On Thu, Dec 22, 2016 at 1:12 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> I don't think we have too many config options that interact in this
>> way, so I understand that "last writing of a particular configuration"
>> makes sense, but interactions between configs is something that would
Stefan Monov writes:
> I'd like to use just:
>
> git push
>
> or at most:
>
> git push origin
>
> rather than having to first check which is the active branch with `git
> branch --list`, then type:
>
> git push origin
Perhaps you are a target audience of
$ git config push.defau
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 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 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
> > +* because the original will get closed
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. For ease of testing, I also have
Luke Diamand writes:
> The change puts the logic into stripRepoPath() instead, which is
> indeed called from both of those functions (good), but also from
> splitFilesIntoBranches(), but only if self.useClientSpec is set. That
> function only gets used if we're doing the automatic branch detectio
Also, if I do the "setup" step (`push -u`) for a branch that doesn't
exist yet (neither on my PC nor on the server), does that remove the
need to do `git checkout -b ` first?
On Thu, Dec 22, 2016 at 11:14 PM, Stefan Monov wrote:
> Hi.
>
> I'd like to use just:
>
> git push
>
> or at most:
>
>
Hi.
I'd like to use just:
git push
or at most:
git push origin
rather than having to first check which is the active branch with `git
branch --list`, then type:
git push origin
At [1] and [2] I've seen that if I do this once:
git push -u origin
then from then on I can use
Jacob Keller writes:
> I don't think we have too many config options that interact in this
> way, so I understand that "last writing of a particular configuration"
> makes sense, but interactions between configs is something that would
> have never occurred to me. I'll send a patch to drop the co
I've only one request for clarification below. Otherwise, the patch
looks good.
(lines removed by the patch trimmed)
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 associate
Brandon Williams writes:
> On 12/22, Johannes Sixt wrote:
>> 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, str
Hello,
Complement of the Season, I'M Anessa female 25 years old single, I am
contacting you because I will be relocating to your country. I will send you my
photos and also tell you much about my self.
Thanks.
Sincerely yours
Anessa.
Duy Nguyen writes:
> But I think I could approach it a different way:
> collect colors that have names. That reduces the number of colors so
> we can go back to "step 1 at a time" and still don't run into two
> similar colors often.
I suspect that there is a "cultural" bias that makes the i
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 allowed; that was my conclusion. But now that you ask, I'll
double-check.
Ok
Signed-off-by: Stefan Beller
---
When working on a large feature consisting of lots of commits,
my development workflow is to create a lot of very small commits and
then reshuffle these via interactive rebase.
Sometimes the commit message titles for these very small commits are
not as good as I
Am 22.12.2016 um 18:33 schrieb Brandon Williams:
It took me a couple extra seconds to realize that
offset_1st_component returns 0 with a relative path, which makes causes
the call to get_root_part to essentially be a noop (ie nothing is
resolved).
Yeah, I am still unsure whether it is a good id
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. For ease of testing, I also have a branch
based on master which you can pull via
git pull https:/
Johannes Schindelin writes:
>> Sorry, but I didn't mean to "suggest replacement". I was just
>> testing my understanding by attempt to rephrase the gist of it.
>
> I did like your phrasing, though.
OK, then let's use these three patches as-is. I just made sure that
they can go to maintenance t
Junio C Hamano writes:
> Johannes Schindelin writes:
> ...
>> - fixed the confusing commit message by using Junio's suggested
>> replacement
>
> Sorry, but I didn't mean to "suggest replacement". I was just
> testing my understanding by attempt to rephrase the gist of it.
> ...
> Your "use th
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 snuck that one in when
re-
Jeff King writes:
> Well, no, I mostly just said that I do not think there is any point in
> defining NDEBUG in the first place, as there is little or no benefit to
> removing those asserts from the built product.
> ...
> Sure, if you want to mass-convert them, doing so with a macro similar to
>
Johannes Schindelin writes:
> 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 o
On 12/22, Johannes Sixt wrote:
> 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)
> >>+{
From: Alan Davies
Git only colours the output and uses pagination if isatty() returns 1.
MSYS2 and Cygwin emulate pseudo terminals via named pipes, meaning that
isatty() returns 0.
f7f90e0f4f (mingw: make isatty() recognize MSYS2's pseudo terminals
(/dev/pty*), 2016-04-27) fixed this for MSYS2 t
From: Jeff Hostetler
Git for Windows has carried a patch that depended on internals
of MSVC runtime, but it does not work correctly with recent MSVC
runtime. A replacement was written originally for compiling
with VC++. The patch in this message is a backport of that
replacement, and it also fixe
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 GetCons
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 wi
Hi,
I'm trying to clone a SVN repo in order to migrate it to git but i hit
a wall with SVN branch names that contain a backslash, which seems to be
allowed in SVN but prohibited in git refs:
r289 = c4cb1f0c34e741a07de9673515c853d49c5522b9
(refs/remotes/origin/dicomBaseClass)
Found possible branc
On Tue, Dec 20, 2016 at 11:57 PM, Jeff King wrote:
> On Tue, Dec 20, 2016 at 07:39:29PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> I got mad after tracing two consecutive red history lines in `git log
>> --graph --oneline` back to their merge points, f
On Wed, Dec 21, 2016 at 12:26 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> diff --git a/graph.c b/graph.c
>> index d4e8519..75375a1 100644
>> --- a/graph.c
>> +++ b/graph.c
>> @@ -78,6 +78,7 @@ static void graph_show_line_prefix(const struct
>> diff_options *diffopt)
>>
>> sta
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.
>
> I think the latter is what you have at
On 12/21/2016 08:07 PM, Marc Branchaud wrote:
> On 2016-12-20 07:05 PM, Michael Haggerty wrote:
>> On 12/20/2016 04:01 PM, Marc Branchaud wrote:
>>> [...]
>>> Please don't change the remotebgcolor default.
>>>
>>> Also, perhaps the default remoterefbgcolor should be
>>> set remoterefbgcolor $he
55 matches
Mail list logo
