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 described
On Mon, Oct 14, 2019 at 9:20 PM Jeff King wrote:
> There are a few lines just above that have 8+ spaces. Arguably those
> could be tabs, too, depending on your view of tabs. We usually do "8
> spaces is a tab" in the Git project, but the oft-repeated "tabs to
> indent, spaces to align" mantra woul
On Tue, Oct 15, 2019 at 03:31:26AM +, Norman Rasmussen via GitGitGadget
wrote:
> From: Norman Rasmussen
>
> This changes the indent from
> ""
> to
> ""
> so that the statement lines up with the rest of the block.
Yep, that makes sense. Looks like I introduced the problem (most of my
pe
Hi Junio,
Thanks for the feedback.
On Tue, Oct 15, 2019 at 11:16:35AM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > Since this
> > seems to be a Python-ism that's mistakenly leaked into our code, convert
>
> The conclusion is OK, but as the inventor of format-patch and a
> non-p
This changes the indent from
""
to
""
so that the statement lines up with the rest of the block.
Signed-off-by: Norman Rasmussen
Norman Rasmussen (1):
diff-highlight: fix a whitespace nit
contrib/diff-highlight/DiffHighlight.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base
From: Norman Rasmussen
This changes the indent from
""
to
""
so that the statement lines up with the rest of the block.
Signed-off-by: Norman Rasmussen
---
contrib/diff-highlight/DiffHighlight.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/diff-highlight/Dif
Eric Wong writes:
> I just took a brief look, but that appears to leak memory.
>
> "hashmap_free(var, 1)" should be replaced with
> "hashmap_free_entries(var, struct foo, member)"
>
> Only "hashmap_free(var, 0)" can become "hashmap_free(var)"
I deliberately avoided merge-time band-aid fixups on
Wink Saville writes:
> When --prefix-tags is passed to `git remote add` the tagopt is set to
> --prefix-tags and a second fetch line is added so tags are placed in
> a separate hierarchy per remote.
In the olden days, there was no refs/remotes/$remoteName/ hiearchy,
and until we made it the def
Denton Liu writes:
> diff --git a/builtin/log.c b/builtin/log.c
> index d212a8305d..af33fe9ffb 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -1057,6 +1072,44 @@ static void show_diffstat(struct rev_info *rev,
> fprintf(rev->diffopt.file, "\n");
> }
>
> +static void pp_from_desc
Denton Liu writes:
> Since this
> seems to be a Python-ism that's mistakenly leaked into our code, convert
The conclusion is OK, but as the inventor of format-patch and a
non-pythonista, I do not think the above claim is correct, and even
if Thomas thought it was a good idea to follow Pytho
SZEDER Gábor writes:
>> -# The recommended way to install this script is to copy to '~/.zsh/_git',
>> and
>> -# then add the following to your ~/.zshrc file:
>> +# The recommended way to install this script is to make a copy of it in
>> +# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then
"kdnakt via GitGitGadget" writes:
> @@ -661,7 +662,7 @@ msgstr ""
> #: lib/merge.tcl:108
> #, tcl-format
> msgid "%s of %s"
> -msgstr "%s の %s ブランチ"
> +msgstr "%2$s の %1$s ブランチ"
>
> #: lib/merge.tcl:122
> #, tcl-format
> @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました"
> #: lib/checkout_op.t
René Scharfe writes:
> The first step for deleting an item from a linked list is to locate the
> item preceding it. Be more careful in release_request() and handle an
> empty list. This only has consequences for invalid delete requests
> (removing the same item twice, or deleting an item that w
Johannes Schindelin wrote:
> On Fri, 11 Oct 2019, Junio C Hamano wrote:
> > * ds/sparse-cone (2019-10-08) 17 commits
> > - sparse-checkout: cone mode should not interact with .gitignore
> > - sparse-checkout: write using lockfile
> > - sparse-checkout: update working directory in-process
> > -
Jakob Jarmar writes:
> git stash push does not recursively stash submodules, but if
> submodule.recurse is set, it may recursively reset --hard them. Having
> only the destructive action recurse is likely to be surprising
> behaviour, and unlikely to be desirable, so the easiest fix should be to
When pushing more than one reference with the --atomic option, the
server is supposed to perform a single atomic transaction to update the
references, leaving them either all to succeed or all to fail. This
works fine when pushing locally or over SSH, but when pushing over HTTP,
we fail to pass th
> I've got someone to test this with the latest 2.23.0 version on archlinux.
>
> It is still happening:
>
> git clone --depth=1 --recurse-submodules --origin upstream
> https://github.com/git-for-windows/git;
> git -C git config --get submodule.active
> expected true, got .
>
> Anything more I nee
This fix is intended to let gitk preserve the window pane dimensions
regardless of whether ttk is enabled or not. I'm not an expert on Tcl/Tk but
as far as I can tell, this edit works and doesn't cause problems. Please
double-check what I did.
Eric Huber (1):
gitk: Preserve window dimensions on
From: Eric Huber
Bug was: gitk would overwrite the botwidth setting in .gitk with
a nonsense value when not using tk themes. I'm not sure if this
is the right fix or not but it seems to work. Moving the affected
line within the conditional results in the expected behavior.
Signed-off-by: Eric Hu
The specification of promisor packfiles (in partial-clone.txt) states
that the .promisor files that accompany packfiles do not matter (just
like .keep files), so whenever a packfile is fetched from the promisor
remote, Git has been writing empty .promisor files. But these files
could contain more u
Thanks for your comments. Rearranging them:
> This makes me wonder why we don't also change index-pack to write a
> similar message to the .promisor. I guess there's potentially too much
> information to shove all the refs on the command-line?
index-pack already is capable of writing messages to
On Fri, Oct 11, 2019 at 10:54:28AM -0700, Maxim Belsky via GitGitGadget wrote:
> From: Maxim Belsky
>
> The original comment does not describe type of ~/.zsh/_git explicitly
> and zsh does not warn or fail if a user create it as a dictionary.
> So unexperienced users could be misled by the origin
I have a few questions below, but they're probably due to lack of a full
understanding on my part of how packfiles are managed.
On 2019.08.26 14:47, Jonathan Tan wrote:
> The specification of promisor packfiles (in partial-clone.txt) states
> that the .promisor files that accompany packfiles do no
Hi Phillip,
On Mon, 14 Oct 2019, Phillip Wood wrote:
> Hi Dscho & Junio
>
> On 11/10/2019 05:24, Junio C Hamano wrote:
> > Johannes Schindelin writes:
> >
> >>> builtin/commit.c | 22 --
> >>> commit.h | 3 ---
> >>> sequencer.c | 45 +++
On 14/10/2019 18:57, Pratyush Yadav wrote:
list "refs/heads/MSVC-README" [list "commit"
"056fb95c8e983ec07e9f5f8baa0b119bf3d13fed" [concat "" "Philip Oakley"]
[reformat_date [concat "" "Sun May 19 22:33:37 2019 +0100"]]
"compat/vcSegmentation fault
Not exactly the same, but almost. Ends the sam
When --prefix-tags is passed to `git remote add` the tagopt is set to
--prefix-tags and a second fetch line is added so tags are placed in
a separate hierarchy per remote.
For example:
$ git remote add -f --prefix-tags gbenchmark g...@github.com:google/benchmark
Updating gbenchmark
warning:
Hello,
This patch was originally created as a pull request on github [1] and
then languisheh as I forgot about it. Recently I was asked to revive it
and have done so. I've rebased on top of master and validated it still
works.
Please review.
-- Wink
[1]: https://github.com/git/git/pull/486
Win
> > Well, I agree that it could be better, but with the C language as we
> > have it now, I still slightly prefer an enum to a list of #define. Both
> > ways, we still have to manually enter values for each flag, but with
> > enum, we get better debugger display (at least in gdb) and in the
> > fun
Before, when format-patch generated a cover letter, only the body would
be populated with a branch's description while the subject would be
populated with placeholder text. However, users may want to have the
subject of their cover letter automatically populated in the same way.
Teach format-patch
Currently, format-patch only puts "*** SUBJECT HERE ***" when a cover
letter is generated. However, it is already smart enough to be able to
populate the cover letter with the branch description so there's no
reason why it cannot populate the subject as well.
Teach format-patch the `--cover-from-d
Before, `thread` and `config_cover_letter` were defined as ints even
though they behaved as enums. Define actual enums and change these
variables to use these new definitions.
Signed-off-by: Denton Liu
---
Hi Junio, I double-checked and made sure that there is no arithmetic
done on the new enums.
Commit 30984ed2e9 (format-patch: support deep threading, 2009-02-19),
introduced the following lines:
#define THREAD_SHALLOW 1
[...]
thread = git_config_bool(var, value) && THREAD_SHALLOW;
Since git_config_bool() returns a bool, the trailing `&& THREAD_SHALLOW`
is a no-o
Hi James,
On Mon, 14 Oct 2019, James Coglan wrote:
> [...] How should I go about sharing the current state of my patch
> series after I've incorporated all the changes suggested here? Should
> I post them as replies on this thread, or start a new pull request via
> GitGitGadget?
Just force-push
On 10/12/2019 6:59 PM, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> wrote:
>>
>> From: Derrick Stolee
>>
>> If two 'git sparse-checkout set' subcommands are launched at the
>> same time, the behavior can be unexpected as they compete to write
>> the spar
On 10/12/2019 6:57 PM, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> wrote:
>>
>> From: Derrick Stolee
>>
>> The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the
>> skip-worktree bits in the index and to update the working directory.
>>
On 10/12/2019 6:16 PM, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> wrote:
>>
>> From: Derrick Stolee
>>
>> The read-tree builtin has a --verbose option that signals to show
>> progress and other data while updating the index. Update this to
>> be on by
On 10/11/2019 6:27 PM, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> wrote:
>>
>> From: Derrick Stolee
>>
>> The 'git sparse-checkout set' subcommand takes a list of patterns
>> and places them in the sparse-checkout file. Then, it updates the
>> working
On 10/11/2019 6:14 PM, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> wrote:
>> ++
>> +The init subcommand also enables the 'extensions.worktreeConfig' setting
>> +and sets the `core.sparseCheckout` setting in the worktree-specific config
>> +file. This pre
On Mon, Oct 14, 2019 at 11:27:54AM -0700, Jonathan Tan wrote:
> > Jonathan Tan writes:
> >
> > >> > Also, I have a slight preference for putting "= 02" on the BLAME_COPY
> > >> > line but that is not necessary.
> > >>
> > >> That is absolutely necessary; it is not like "we do not care what
> > >
Hi René,
On Mon, 14 Oct 2019, René Scharfe wrote:
> Am 14.10.19 um 13:13 schrieb Johannes Schindelin:
>
> > On Sun, 13 Oct 2019, René Scharfe wrote:
> >
> >> This changes the behavior, though: The old code skips all kinds of
> >> Control Sequence Introducer sequences, while utf8_strnwidth() only
> Jonathan Tan writes:
>
> >> > Also, I have a slight preference for putting "= 02" on the BLAME_COPY
> >> > line but that is not necessary.
> >>
> >> That is absolutely necessary; it is not like "we do not care what
> >> exact value _COPY gets; it can be any value as long as it is _MOVE
> >> pl
On 14/10/19 01:45PM, Philip Oakley wrote:
> Hi Pratyush,
> On 13/10/2019 19:50, Pratyush Yadav wrote:
> > Just to be sure it is a git-gui/Tcl issue and not an upstream
> > git.git
> > issue, can you run:
> >
> >fmt='list %(refname) [list %(objecttype) %(objectname) [concat
> > %(taggername)
Hi kdnakt,
I updated the commit message subject locally to "git-gui: improve
Japanese translation" to match our commit message style.
On 14/10/19 01:31AM, kdnakt via GitGitGadget wrote:
> From: kdnakt
>
> Signed-off-by: kdnakt
> ---
> git-gui/po/ja.po | 9 +
You based this patch on t
On 10/14/2019 11:38 AM, James Coglan wrote:
> On 13/10/2019 07:56, Jeff King wrote:
>> On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote:
>>
I should have noticed in your earlier commits, but why don't you keep
the output inside the test suite? You can start with "cat >expect <
On 13/10/2019 08:15, Jeff King wrote:
> On Thu, Oct 10, 2019 at 09:13:42AM -0700, James Coglan via GitGitGadget wrote:
>
>> A final addition to that set of changes fixes the coloring of dashes that
>> are drawn next to octopus merges, in a manner compatible with all these
>> changes. The early com
On 13/10/2019 07:56, Jeff King wrote:
> On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote:
>
>>> I should have noticed in your earlier commits, but why don't you keep
>>> the output inside the test suite? You can start with "cat >expect <<-EOF"
>>> to have it ignore leading whitespace.
On 14/10/19 10:55AM, Jiang Xin wrote:
> 김건우 于2019年10月10日周四 上午12:02写道：
> >
> > Hello.
> >
> > I have a question whether the GIT GUI project still in progress or not
> > because I want to contribute to translating GIT GUI into Korean. I asked
> > prati0100 who is a maintainer of GIT GUI on
> > Githu
Am 14.10.19 um 13:13 schrieb Johannes Schindelin:
> Hi René,
>
> On Sun, 13 Oct 2019, René Scharfe wrote:
>
>> This changes the behavior, though: The old code skips all kinds of
>> Control Sequence Introducer sequences, while utf8_strnwidth() only skips
>> the Select Graphic Rendition kind, i.e. th
Hi Dscho & Junio
On 11/10/2019 05:24, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>>> builtin/commit.c | 22 --
>>> commit.h | 3 ---
>>> sequencer.c | 45 ++---
>>> sequencer.h | 2 ++
>>> 4 files changed
On 12/10/2019 02:36, Derrick Stolee wrote:
> On 10/11/2019 12:50 PM, James Coglan wrote:
>> On 10/10/2019 18:19, Derrick Stolee wrote:
>>> On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote:
+++ b/t/t4215-log-skewed-merges.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+test_des
On 14/10/2019 13:55, James Coglan wrote:
> Thanks! For completeness, here is the current state of this patch after I've
> been through the feedback up to this point:
>
> From 241180570fbaae04a2263c5ff1ab3b92f54f8004 Mon Sep 17 00:00:00 2001
> From: James Coglan
> Date: Thu, 22 Aug 2019 09:30:08
On 12/10/2019 01:27, Junio C Hamano wrote:
> James Coglan writes:
>
>> - We don't want a general solution to this problem for everything
>> `strbuf` could be used for; it only needs to address the graph
>> padding problem.
>
> Of course. Somebody may use strbuf to hold rows of a table and you
>
Hi Alban,
On Mon, 7 Oct 2019, Alban Gruin wrote:
> This can be seen as a continuation of ag/reduce-rewriting-todo.
>
> Currently, complete_action() releases its todo list before calling
> sequencer_continue(), which reloads the todo list from the disk. This
> series removes this useless round tr
Hi Pratyush,
On 13/10/2019 19:50, Pratyush Yadav wrote:
I've tried both parts and seen that this looks like some form of buffer
overrun or size limit
Looks like it, but I'm not sure if that is on our end.
with the mods I ran:
$ git gui > branch_create.txt
which produced the 'same' error mis
Hi,
On Mon, 14 Oct 2019, Johannes Schindelin wrote:
> On Thu, 11 Oct 2018, Junio C Hamano wrote:
>
> > Ævar Arnfjörð Bjarmason writes:
> >
> > >> It also means that we no longer need the inet_pton() and inet_ntop()
> > >> emulation, which is nice.
> > >
> > > Earlier in this series you add a:
>
Hi Ævar,
[sorry about the blast from the past, I forgot to answer back then.]
On Wed, 10 Oct 2018, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Oct 03 2018, Johannes Schindelin via GitGitGadget wrote:
>
> > diff --git a/config.mak.uname b/config.mak.uname
> > index e47af72e01..8acdeb71fd 100644
> >
Hi,
[sorry about the blast from the past, I just noticed that I had not
answered]
On Thu, 11 Oct 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> >> It also means that we no longer need the inet_pton() and inet_ntop()
> >> emulation, which is nice.
> >
> > Earlier in this serie
[Cc:ing the Git GUI maintainer]
On Mon, 14 Oct 2019, kdnakt via GitGitGadget wrote:
> From: kdnakt
>
> Signed-off-by: kdnakt
> ---
> git-gui/po/ja.po | 9 +
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po
> index 208651c1af..2f611
Hi René,
On Sun, 13 Oct 2019, René Scharfe wrote:
> Make use of utf8_strnwidth()'s feature to skip ANSI escape sequences
> instead of open-coding it. This shortens the code and makes it more
> consistent.
Sounds good.
> This changes the behavior, though: The old code skips all kinds of
> Contr
Hi Elijah,
On Sat, 12 Oct 2019, Elijah Newren wrote:
> On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin
> wrote:
> >
> [...]
> > For the record: I am still a huge anti-fan of splitting `setup` test
> > cases from the test cases that do actual things, _unless_ it is
> > _one_, and _only one_,
Hi Pratyush,
On Mon, 14 Oct 2019, Pratyush Yadav wrote:
> On 12/10/19 11:24PM, Johannes Schindelin wrote:
> >
> > On Sat, 12 Oct 2019, Pratyush Yadav wrote:
> >
> > > On 08/10/19 04:33AM, Johannes Schindelin via GitGitGadget wrote:
> > >
> > > > @@ -1453,10 +1501,16 @@ proc rescan {after {honor_t
61 matches
Mail list logo
