Just another patch from Git for Windows' branch thicket...
Jeff Hostetler (1):
diffcore-rename: speed up register_rename_src
diffcore-rename.c | 13 +
1 file changed, 13 insertions(+)
base-commit: 8104ec994ea3849a968b4667d072fedd1e688642
Published-As:
https://github.com/gitgitga
Dear Git users,
It is my pleasure to announce that Git for Windows 2.22.0 is available from:
https://gitforwindows.org/
Changes since Git for Windows v2.21.0 (February 26th 2019)
New Features
* Comes with Git v2.22.0.
* The awk included in Git for Windows now includes extensions su
Hi Junio,
On Thu, 6 Jun 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I vaguely recall seeing just one 'x' once. I think last time I had a
> >> problem with truncating st_ino, but that should be fixed in e66ceca94b
> >> (clone: fix c
Hi,
On Wed, 5 Jun 2019, Nickolai Belakovski wrote:
> On Thu, May 30, 2019 at 5:20 PM Junio C Hamano wrote:
> >
> > * nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
> > - branch: add worktree info on verbose output
> > - branch: update output to include worktree info
> > - ref-filt
Hi Duy,
On Wed, 5 Jun 2019, Duy Nguyen wrote:
> On Wed, Jun 5, 2019 at 6:27 PM Jeff King wrote:
> >
> > On Wed, Jun 05, 2019 at 10:12:12AM +0200, Johannes Schindelin wrote:
> >
> > > This fails on macOS, in t5601, both in our osx-clang and osx-gcc jobs, as
>
Hi Denton,
On Wed, 5 Jun 2019, Denton Liu wrote:
> Currently, if a user wishes to have individual settings per branch, they
> are required to manually keep track of the settings in their head and
> manually set the options on the command-line or change the config at
> each branch.
>
> Teach confi
Hi Denton,
On Wed, 5 Jun 2019, Denton Liu wrote:
> Thanks for the review, Johannes. I think it's a good idea to add another
> alias for `-p` so included that suggestion. Also, while I was at it, I
> found a typo so I fixed that too.
>
> Changes since v1:
>
> * s/loud-merge/loud-rebase/
> * Add `-
Hi Denton,
On Fri, 31 May 2019, Denton Liu wrote:
> One can see that an alias that begins with a non-command first word,
> such as `loud-rebase = -c commit.verbose=true rebase`, is permitted.
> However, this isn't immediately obvious to users as alias instances
> typically begin with a command.
>
Hi Wen Bei Li,
On Tue, 4 Jun 2019, Wen Bei Li wrote:
> Teach difftool and mergetool about VS Code and VS Code Insiders
>
> Signed-off-by: Wen Bei Li
> ---
> Hello Johannes, thank you for reviewing my patch. It's the first time
> I've done this via email.
Heh, I hear you. It makes me happy that
On Mon, 3 Jun 2019, Felipe Contreras wrote:
> Felipe Contreras (5):
> t5801 (remote-helpers): cleanup refspec stuff
> t5801 (remote-helpers): add test to fetch tags
> fetch: trivial cleanup
> fetch: make the code more understandable
> fetch: fix regression with transport helpers
>
> bui
Hi Denton,
On Fri, 31 May 2019, Johannes Schindelin wrote:
> On Fri, 31 May 2019, Denton Liu wrote:
>
> > Currently, if a user wishes to have individual settings per branch,
> > they are required to manually keep track of the settings in their head
> > and manually set th
Hi Junio,
On Mon, 3 Jun 2019, Junio C Hamano wrote:
> * pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
> - rebase --abort/--quit: cleanup refs/rewritten
> - sequencer: return errors from sequencer_remove_state()
> - rebase: warn if state directory cannot be removed
> - rebase: fix a m
Hi Miguel,
On Tue, 4 Jun 2019, Miguel Ojeda wrote:
> The ForEachMacros list can reasonably be generated grepping
> the C source code for macros with 'for_each' in their name.
>
> Taken almost verbatim from the .clang-format file in the Linux kernel.
>
> Signed-off-by: Miguel Ojeda
> ---
> We wro
aniels Umanovskis, David Aguilar,
> David Kastrup, Denton Liu, Derrick Stolee, Elijah Newren, Eric
> Sunshine, Eric Wong, İsmail Dönmez, Jean-Noël Avila, Jeff
> Hostetler, Jeff King, Jiang Xin, Joel Teichroeb, Joey Hess,
> Johannes Schindelin, Jonathan Tan, Jordi Mas, Josh Steadmon,
Hi Stolee,
On Mon, 3 Jun 2019, Derrick Stolee via GitGitGadget wrote:
> 1. (Patches 1-3) Introduce a new 'core.size' config setting that takes
> 'large' as a value. This enables several config values that are
> beneficial for large repos.
I find `core.size` a bit non-descriptive. Maybe
Hi Tigran,
On Tue, 4 Jun 2019, Tigran Mkrtchyan wrote:
> As may CI/CD tools don't allow to control command line options when
s/may/many/, maybe?
> executing `git tag` command, a default value in the configuration file
> will allow to enforce tag signing if required.
>
> The new config-file opti
Hi Wen Bei Li,
On Mon, 3 Jun 2019, Wen Bei Li wrote:
> Teach difftool and mergetool about VS Code.
> ---
Even if it is a very short commit message (see e.g.
https://github.com/git-for-windows/git/commit/581d2fd9f2d6 for a typical
commit message in Git's repository), I think it is okay.
Personal
Hi,
On Tue, 4 Jun 2019, Johannes Sixt wrote:
> Am 04.06.19 um 00:00 schrieb Drew DeVault:
> > On Mon Jun 3, 2019 at 11:09 PM Johannes Sixt wrote:
> >> I have to wonder how --check works when 'am' applies multiple patches.
> >>
> >> When the second patch in a patch series depends on that the first
mit`, now that everything is clear? That should
send a new iteration of your patch to the mailing list for review.
Thanks,
Johannes
> Johannes Schindelin 於 2019年6月3日 週一 下午10:17寫道：
> >
> > Hi John Lin,
> >
> > On Sat, 1 Jun 2019, 林自均 wrote:
> >
> > >
Hi Phillip,
On Mon, 3 Jun 2019, Phillip Wood wrote:
> On 03/06/2019 14:40, Johannes Schindelin wrote:
> >
> > On Sun, 2 Jun 2019, Phillip Wood wrote:
> >
> > > On 22/03/2019 14:06, Johannes Schindelin wrote:
> > >
> > > > On Thu, 13 Sep 2018,
Hi John Lin,
On Sat, 1 Jun 2019, 林自均 wrote:
> Johannes Schindelin 於 2019年5月29日 週三
> 下午7:51寫道：
> >
> > You could already rebase it on top of
> > https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in
> > your cover letter, and send a new
Hi Randall,
On Sun, 2 Jun 2019, Randall S. Becker wrote:
> Just a few small nits from RC2 test results on the NonStop TNS/E
> platform:
>
> 1. t0021 subtest 15 is being flakey. It fails on the first run (make -k
> test) but succeeds when run in isolation. This is new on the NonStop
> TNS/E platfo
Hi Jian Xin,
On Sun, 2 Jun 2019, Jiang Xin wrote:
> + ed8b4132c8 (remote-curl: mark all error messages for translation,
> 2019-03-05)
Urgh. Sorry for that, and thank you for cleaning up my mess...
Ciao,
Dscho
Hi Phillip,
On Sun, 2 Jun 2019, Phillip Wood wrote:
> On 22/03/2019 14:06, Johannes Schindelin wrote:
>
> > On Thu, 13 Sep 2018, Phillip Wood wrote:
> >
> > > On 03/09/2018 20:01, Jochen Sprickerhof wrote:
> > >
> > > > * Phillip Wood [2018-08-3
Hi Jeffrey,
On Sun, 2 Jun 2019, Jeffrey Walton wrote:
> On Sun, Jun 2, 2019 at 7:21 AM Michal Suchánek wrote:
> >
> > On Sun, 2 Jun 2019 06:43:07 -0400
> > Jeffrey Walton wrote:
> >
> > > I have a lot of experience with cutting in SHA acceleration. I have
> > > no experience with Git.
> >
> > s
Hi Junio,
On Fri, 31 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> * cc/list-objects-filter-wo-sparse-path (2019-05-29) 1 commit
> >> (merged to 'next' on 2019-05-30 at 5a294203ad)
> >> + list-objects-filter: disable 's
Hi Denton,
On Fri, 31 May 2019, Denton Liu wrote:
> Currently, if a user wishes to have individual settings per branch, they
> are required to manually keep track of the settings in their head and
> manually set the options on the command-line or change the config at
> each branch.
>
> Teach conf
Hi Stolee,
On Fri, 31 May 2019, Derrick Stolee wrote:
> On 5/30/2019 2:24 PM, Derrick Stolee wrote:
> > Further, these tests failed
> >
> > t3400-rebase.sh (Wstat: 256 Tests: 28 Failed: 2)
> > Failed tests: 20, 28
> > Non-zero exit status: 1
> > t3420-rebase-autosta
nly by me, and for less than two months: the
benefit is just too great to pass up.
So yeah, I run Git for Windows in a different way than you run Git, and I
think both ways have their merits.
> [...]
> Johannes Schindelin writes:
>
> > On Thu, 30 May 2019, Junio C Hamano wrote:
Hi Denton,
On Fri, 31 May 2019, Denton Liu wrote:
> On Fri, May 31, 2019 at 02:58:30PM +0200, Johannes Schindelin wrote:
>
> > On Thu, 30 May 2019, Denton Liu wrote:
> >
> > > Currently, if a user wishes to have individual settings per branch,
> > > they ar
Hi Junio,
On Fri, 31 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> The second round of release candidate has been tagged, after slipping
> >> for several days to merge a handful of last-minute regression fixes.
> >
> > You hinted in an
Hi,
On Thu, 30 May 2019, Denton Liu wrote:
> Currently, if a user wishes to have individual settings per branch, they
> are required to manually keep track of the settings in their head and
> manually set the options on the command-line or change the config at
> each branch.
>
> Teach config the
Hi Junio,
On Thu, 30 May 2019, Junio C Hamano wrote:
> * bb/unicode-12.1-reiwa (2019-05-29) 1 commit
> (merged to 'next' on 2019-05-30 at 016465335c)
> + unicode: update the width tables to Unicode 12.1
> <<
> * bb/unicode-12.1-reiwa (2019-05-29) 1 commit
> - unicode: update the width tables
rick Stolee, Elijah Newren, Eric
> Sunshine, Eric Wong, İsmail Dönmez, Jean-Noël Avila, Jeff
> Hostetler, Jeff King, Jiang Xin, Joel Teichroeb, Joey Hess,
> Johannes Schindelin, Jonathan Tan, Jordi Mas, Josh Steadmon,
> Junio C Hamano, Kyle Meyer, Martin Ågren, Matthew Kraai, Mik
Hi Junio,
On Thu, 30 May 2019, Junio C Hamano wrote:
> 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
Hi Stolee,
On Thu, 30 May 2019, Derrick Stolee wrote:
> On 5/30/2019 4:46 PM, Johannes Schindelin wrote:
> >
> > On Thu, 30 May 2019, Derrick Stolee wrote:
> >
> >> On 4/9/2019 12:11 PM, Christian Couder wrote:
> >>> From: Christian Couder
&g
Hi,
On Thu, 30 May 2019, Derrick Stolee wrote:
> On 4/9/2019 12:11 PM, Christian Couder wrote:
> > From: Christian Couder
> >
> > +{
> > + int i, missing_nr = 0;
> > + int *missing = xcalloc(oid_nr, sizeof(*missing));
> > + struct object_id *old_oids = *oids;
> > + struct object_id *new_
Hi Philip,
On Thu, 30 May 2019, Philip Oakley wrote:
> On 30/05/2019 15:53, Johannes Schindelin wrote:
> >
> > Having said that, there was a patch series recently to add the ability to
> > stage individual lines,
>
> I believe that the git-gui (in tk/tcl, but using
Hi Gábor,
do you have any idea why Travis is failing like this in the macOS/gcc
job?
> +case "$jobname" in
> +brew link gcc@8
> Error: No such keg: /usr/local/Cellar/gcc@8
> The command "ci/install-dependencies.sh" failed and exited with 1 during .
I usually only look at the Azure Pipelines (whi
Hi Peff,
On Thu, 30 May 2019, Jeff King wrote:
> On Wed, May 29, 2019 at 09:53:44AM -0700, Junio C Hamano wrote:
>
> > >> * ds/object-info-for-prefetch-fix (2019-05-28) 1 commit
> > >> - sha1-file: split OBJECT_INFO_FOR_PREFETCH
> > >>
> > >> Code cleanup.
> > >>
> > >> Will merge to 'next'.
>
Hi James,
On Wed, 29 May 2019, James Harvey wrote:
> When adding interactively, 's' can be used to split the current hunk.
> Once it gets down to where 's' reports "Sorry, cannot split this
> hunk", it could be useful if it would then start splitting based on
> empty lines, probably leaving empty
Hi Junio,
On Wed, 29 May 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > On Wed, May 29 2019, Johannes Schindelin wrote:
> >
> >> On Tue, 28 May 2019, Junio C Hamano wrote:
> >>
> >>> * ab/send-email-transferencoding-fix
post-v2.22.0 to
brush up those gitk patches and contribute them to the Git mailing list
for review.
> On Sat, Apr 27, 2019 at 4:20 PM Johannes Schindelin
> wrote:
> >
> > Hi Bret,
> >
> > On Thu, 18 Apr 2019, Bret Barkelew wrote:
> >
> > > This i
Hi Junio & Ævar,
On Tue, 28 May 2019, Junio C Hamano wrote:
> * ab/send-email-transferencoding-fix (2019-05-19) 7 commits
> - send-email: fix regression in sendemail.identity parsing
> - send-email: document --no-[to|cc|bcc]
> - send-email: fix broken transferEncoding tests
> - send-email: re
Hi Peff,
On Tue, 28 May 2019, Jeff King wrote:
> On Tue, May 28, 2019 at 01:06:21PM +0200, Johannes Schindelin wrote:
>
> > > Or do you prefer having a one-liner? I'd rather come up with a more
> > > generic helper to cover this case, that can run any command and
Hi John Lin,
On Wed, 29 May 2019, 林自均 wrote:
> Junio C Hamano 於 2019年5月29日 週三 上午4:41寫道：
> >
> > 林自均 writes:
> >
> > > John Lin via GitGitGadget 於 2019年5月15日 週三
> > > 下午6:54寫道：
> > >>
> > >> From: John Lin
> > >>
> > >> Before this patch, there is inconsistency between the status
> > >> messa
Hi Junio,
On Tue, 28 May 2019, Junio C Hamano wrote:
> "Mike Mueller via GitGitGadget" writes:
>
> > From: Mike Mueller
> >
> > git p4 unshelve was failing with these errors:
> >
> > fatal: Not a valid object name HEAD0
> > Command failed: git cat-file commit HEAD^0
> >
> > (git version 2.21.0.
Hi,
On Wed, 29 May 2019, Johannes Schindelin wrote:
> On Sat, 17 Mar 2018, Ævar Arnfjörð Bjarmason wrote:
>
> > In lieu of sending a PR to https://git.github.io/SoC-2018-Microprojects/
> > I thought I'd list a few more suggestions, and hopefully others will
> > c
Hi Ævar,
On Sat, 17 Mar 2018, Ævar Arnfjörð Bjarmason wrote:
> In lieu of sending a PR to https://git.github.io/SoC-2018-Microprojects/
> I thought I'd list a few more suggestions, and hopefully others will
> chime in.
I am in the same camp, and figured that GitGitGadget (which *already*
augment
Hi Junio & Ævar,
On Wed, 22 May 2019, Johannes Schindelin wrote:
> On Fri, 17 May 2019, Ævar Arnfjörð Bjarmason wrote:
>
> > [...]
> > +test_expect_success $PREREQ 'sendemail.identity: bool variable fallback' '
> > + git -c sendemail.identity=cloud \
Hi Matheus,
On Tue, 28 May 2019, Matheus Tavares Bernardino wrote:
> On Tue, May 28, 2019 at 7:37 AM Johannes Schindelin
> wrote:
> >
> > On Mon, 20 May 2019, Matheus Tavares wrote:
> >
> > > > Give "rebase -i" some option so when you "r
Hi Philip,
On Tue, 28 May 2019, Philip Oakley wrote:
> On 28/05/2019 14:56, Jeff Hostetler wrote:
>
> > Did you mean to send this upstream or to Git for Windows?
> >
> > I didn't think that the VS2015/VS2017 vcpkg-aware version of
> > compat/vcbuild/* had made it upstream yet, so this patch might
From: Johannes Schindelin
The `--preserve-merges` option is now deprecated in favor of
`--rebase-merges`; Let's stop recommending the former.
Signed-off-by: Johannes Schindelin
---
Documentation/git-rebase.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --
From: Johannes Schindelin
As of Git v2.22.0, the `--preserve-merges` backend of `git rebase` will
be officially deprecated in favor of the `--rebase-merges` backend.
Consequently, `git pull --rebase=preserve` will also be deprected. State
this explicitly.
Signed-off-by: Johannes Schindelin
Turns out that I forgot a couple of spots when I sent the patch series to
deprecate git rebase -p earlier...
Johannes Schindelin (3):
tests: mark a couple more test cases as requiring `rebase -p`
docs: say that `--rebase=preserve` is deprecated
rebase docs: recommend `-r` over `-p
From: Johannes Schindelin
The `--preserve-merges` option has been deprecated, and as a consequence
we started to mark test cases that require that option to be supported,
in preparation for removing that support eventually.
Since we marked those test cases, a couple more crept into the test
Hi Peff,
On Mon, 27 May 2019, Jeff King wrote:
> On Mon, May 27, 2019 at 12:59:14PM -0700, Johannes Schindelin via
> GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > The deal with bundles is: they really are thin packs, with very little
> >
Hi Peff,
On Fri, 24 May 2019, Jeff King wrote:
> On Thu, May 23, 2019 at 09:12:27AM +0200, Johannes Schindelin wrote:
>
> > > + echo no-conflict >expect &&
> > > + git log -1 --format=%s >actual &&
> > > + test_cmp expect actual
> >
Hi Matheus,
On Mon, 20 May 2019, Matheus Tavares wrote:
> > Give "rebase -i" some option so when you "reword" the patch is
> > included in the message.
> >
> > I keep going to the shell because I have no idea what change I'm
> > describing.
>
> I have the same problem, so I wanted to try solving
Hi,
On Tue, 28 May 2019, Vanak, Ibrahim wrote:
> We are seeing issue with GIT 2.14 version.
You definitely want to upgrade ASAP. Not only is the issue that you
reported fixed, but two distinct vulnerabilities have been fixed since
v2.14.0. Your version is still vulnerable.
Ciao,
Johannes
Hi,
On Tue, 28 May 2019, Philip Oakley wrote:
> On 28/05/2019 08:10, LU Chuck wrote:
> [snip]
> > > Copying and pasting examples literally is dangerous. You should know what
> > > you
> > > are doing.
> > >
> > > "..." is a revision range that computes the mergebase between HEAD and
> > > HEAD,
>
Hi brian,
On Mon, 27 May 2019, brian m. carlson wrote:
> On 2019-05-27 at 19:59:14, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > The deal with bundles is: they really are thin packs, with very little
>
> Generally a colon can
The git bundle verify command really needs access to a .git/
directory. But it did not make sure, instead erroring out with a BUG(),
making for a terrible user experience.
This patch fixes that.
Johannes Schindelin (1):
bundle verify: error out if called without an object database
bundle.c
From: Johannes Schindelin
The deal with bundles is: they really are thin packs, with very little
sugar on top. So we really need a repository (or more appropriately, an
object database) to work with, when asked to verify a bundle.
Let's error out with a useful error message if `git b
Hi,
On Mon, 6 May 2019, Ismael Luceno wrote:
> On 08/Apr/2019 12:54, Ismael Luceno Cortes wrote:
> > - Control+BackSpace: Delete word to the left of the cursor.
> > - Control+Delete : Delete word to the right of the cursor.
> >
> > Originally introduced by BRIEF and Turbo Vision between 1985 an
Hi Brendan,
On Fri, 24 May 2019, Brendan Boerner wrote:
> Ubuntu 14.04
>
> I was using some prior v2.x using linuxbrew, everything was fine, took
> an update, this started happening.
>
> I verified also happens using the 2.21.0 from the Ubuntu 14.04 PPA
> (this reproduction was using that build,
From: Johannes Schindelin
We will need to pass down the `struct index_state` to
`mark_fsmonitor_valid()` for an upcoming bug fix, and this here function
calls that there function, so we need to extend the signature of
`fill_stat_cache_info()` first.
Signed-off-by: Johannes Schindelin
From: Johannes Schindelin
Without this bug fix, t7519's four "status doesn't detect unreported
modifications" test cases would fail occasionally (and, oddly enough,
*a lot* more frequently on Windows).
The reason is that these test cases intentionally use the side effect o
https://github.com/gitgitgadget/git/issues/197
Johannes Schindelin (2):
fill_stat_cache_info(): prepare for an fsmonitor fix
mark_fsmonitor_valid(): mark the index as changed if needed
apply.c| 2 +-
builtin/update-index.c | 2 +-
cache.h| 2 +-
diff-
Hi Randall,
On Thu, 23 May 2019, Randall S. Becker wrote:
> On May 21, 2019 20:48, brian m. carlson wrote:
> > To: Randall S. Becker
> > Cc: 'Git Mailing List'
> > Subject: Re: [Breakage] 2.22.0-rc1 t5401-update-hooks.sh
> >
> > On 2019-05-21 at 21:47:54, Randall S. Becker wrote:
> > > When run
Hi Randall,
On Thu, 23 May 2019, Randall S. Becker wrote:
> On May 23, 2019 16:06, Johannes Schindelin wrote:
> > On Wed, 22 May 2019, Randall S. Becker wrote:
> >
> > > On May 21, 2019 20:48, brian m. carlson wrote:
> > > > To: Randall S. Becker
> > &
Hi Ævar,
On Mon, 18 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
> On Sat, Mar 16 2019, Johannes Schindelin via GitGitGadget wrote:
>
> > It was reported by Ævar Arnfjörð Bjarmason
> > [https://public-inbox.org/git/nycvar.qro.7.76.6.1903142058130..
Hi Randall,
On Wed, 22 May 2019, Randall S. Becker wrote:
> On May 21, 2019 20:48, brian m. carlson wrote:
> > To: Randall S. Becker
> > Cc: 'Git Mailing List'
> > Subject: Re: [Breakage] 2.22.0-rc1 t5401-update-hooks.sh
> >
> > On 2019-05-21 at 21:47:54, Randall S. Becker wrote:
> > > When run
Hi Peff,
On Mon, 20 May 2019, Jeff King wrote:
> In interactive mode, "git am -i --resolved" will try to generate a patch
> based on what is in the index, so that it can prompt "apply this
> patch?". To do so it needs the tree of HEAD, which it tries to get with
> get_oid_tree(). However, this do
Hi Peff,
On Mon, 20 May 2019, Jeff King wrote:
> On Mon, May 20, 2019 at 08:11:13AM -0400, Jeff King wrote:
>
> > We have required that the stdin of "am --interactive" be a tty since
> > a1451104ac (git-am: interactive should fail gracefully., 2005-10-12).
> > However, this isn't strictly necessa
Hi Ævar,
On Fri, 17 May 2019, Ævar Arnfjörð Bjarmason wrote:
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index 61d484d1a6..890e2874c3 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -1228,6 +1228,61 @@ test_expect_success $PREREQ 'sendemail.to works' '
>
Hi Oussama,
On Wed, 22 May 2019, Oussama Ghorbel wrote:
> git diff-index is giving me incorrect information, however if I run git diff,
> then git diff-index again it will show the correct information.
> The steps are the following:
> $ git diff-index --name-only HEAD
> git appears to list all f
Hi Junio,
On Sun, 19 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Wed, 15 May 2019, Junio C Hamano wrote:
> >
> >> Johannes Schindelin writes:
> >>
> >> I was imagining what would happen if we treat _everything_ in the two
Hi Junio,
On Sun, 19 May 2019, Junio C Hamano wrote:
> The first release candidate Git 2.22-rc1 has been tagged. There
> still are a few topics from 'next' that need to go to 'master'
> before the final, but otherwise this should be pretty close to the
> final version. Knock knock...
Fingers c
From: Johannes Schindelin
In 06f5608c14e6 (bisect--helper: `bisect_start` shell function partially
in C, 2019-01-02), we introduced a call to `get_oid()` and did not check
whether it succeeded before using its output.
Signed-off-by: Johannes Schindelin
---
builtin/bisect--helper.c | 5
From: Johannes Schindelin
In bff014dac7d9 (builtin rebase: support the `verbose` and `diffstat`
options, 2018-09-04), we added a line that wanted to remove the
`REBASE_DIFFSTAT` bit from the flags, but it used an incorrect negation.
Found by Coverity.
Signed-off-by: Johannes Schindelin
I looked very briefly over the issues pointed out by Coverity, and decided
to pluck these two low-hanging pieces of fruit.
Johannes Schindelin (2):
rebase: replace incorrect logical negation by correct bitwise one
bisect--helper: verify HEAD could be parsed before continuing
builtin/bisect
Hi Duy,
On Sat, 18 May 2019, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 106148254d..625a24a980 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -822,4 +822,30 @@ test_expect_success EXECKEEPSPID 'killed merge can be
> completed with --cont
Hi Duy,
On Sat, 18 May 2019, Nguyễn Thái Ngọc Duy wrote:
> Another round because apparently the test case is not perfect.
Test cases are never perfect. But at least the good ones are "actionable",
i.e. when they fail, you know there is a regression, it helps you figure
out easily why it broke, a
Hi Peff,
On Mon, 20 May 2019, Jeff King wrote:
> On Mon, May 20, 2019 at 07:28:08AM -0400, Eric Sunshine wrote:
>
> > > The biggest downside is that it's a bit magical from the user's
> > > perspective, because now the password is off in some other file
> > > (usually ~/.git-credentials, but some
Whoops. Meant to comment on this:
On Sun, 19 May 2019, Jeff King wrote:
> diff --git a/transport.c b/transport.c
> index f1fcd2c4b0..ba61e57295 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -1335,11 +1335,7 @@ int transport_disconnect(struct transport *transport)
> return ret;
> }
>
Hi Peff,
On Sun, 19 May 2019, Jeff King wrote:
> When we anonymize URLs to show in messages, we strip out both the
> username and password (if any). But there are also contexts where we
> should strip out the password (to avoid leaking it) but retain the
> username.
>
> Let's generalize transport
Hi Peff,
On Sun, 19 May 2019, Jeff King wrote:
> On Fri, May 17, 2019 at 06:20:31PM -0400, Jeff King wrote:
>
> > What if we did this:
> >
> > 1. Do not ever write the password part of a URL into config.
> >
> > 2. When we extract the user/pass out of a URL, put them into the
> > credent
Hi Junio,
On Sun, 19 May 2019, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" writes:
>
> > This series adds close_commit_graph() to close_all_packs() and then renames
> > close_all_packs() to close_object_store(). This name is more descriptive of
> > its larger purpose.
>
> OK. Some
Hi Stolee,
*really* minor nit: the commit subject probably wants to have a "rename"
after the colon ;-)
The patch looks sensible to me. Since Junio asked for a sanity check
whether all of the call sites of `close_all_packs()` actually want to
close the MIDX and the commit graph, too, I'll do the
Hi Stolee,
On Fri, 17 May 2019, Derrick Stolee via GitGitGadget wrote:
> In Windows, the way we rename a lock file to replace the underlying file
> does not work when a process holds a read handle. For this reason, we call
> close_all_packs() everywhere before starting a git gc --auto subprocess.
, Ben Peart,
> Brandon Richardson, brian m. carlson, Carlo Marcelo Arenas
> Belón, Christian Couder, Daniels Umanovskis, David Aguilar,
> David Kastrup, Denton Liu, Derrick Stolee, Elijah Newren, Eric
> Sunshine, Eric Wong, İsmail Dönmez, Jean-Noël Avila, Jeff
> Hostetler
Hi Ævar,
On Wed, 8 May 2019, Ævar Arnfjörð Bjarmason wrote:
> This seems to work, needs more tests etc...
I can see how it works, but it is a bit limited, and at the same time
overzealous.
The reason why we do not enter the fast-forwarding block in the
interactive case would appear to me to be
Hi Ævar,
On Wed, 8 May 2019, Ævar Arnfjörð Bjarmason wrote:
> The can_fast_forward() function is potentially much more expensive
> than is_interactive() since it e.g. might need to call
> is_linear_history().
>
> So reversing the two looks like an obvious improvement, but doing so
> reveals a pre
Hi Hannes,
On Thu, 16 May 2019, Johannes Sixt wrote:
> Am 16.05.19 um 00:44 schrieb brian m. carlson:
> > On Tue, May 14, 2019 at 05:12:39PM +0200, Johannes Schindelin wrote:
> >> On Tue, 14 May 2019, brian m. carlson wrote:
> >>> +/*
> >>> + * Retur
Hi,
On Thu, 16 May 2019, Jeff King wrote:
> On Wed, May 15, 2019 at 08:59:47PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> >
> > On Wed, May 15 2019, Martin Langhoff wrote:
> >
> > > Spotted this on the internet...
> > >
> > > https://github.blog/2019-05-14-git-ransom-campaign-incident-report/
> >
Hi Junio,
On Thu, 16 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> lacked the "const" for that reason, but apparently some compilers
> >> complain about the parameter type mismatch.
> >
> > We could be more explicit, as we kno
Hi Jonathan,
On Wed, 15 May 2019, Jonathan Tan wrote:
> > > To resolve this, prefetch all missing REF_DELTA bases before attempting
> > > to resolve them. This both ensures that all bases are attempted to be
> > > fetched, and ensures that we make only one request per index-pack
> > > invocation,
Hi Junio,
On Wed, 15 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> See a few nits below, none of which are necessarily worth a re-roll.
> >
> > Thanks!
> >
> > Junio, do you agree, do you want to fix it up on your side?
>
&g
Hi Junio,
On Wed, 15 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> I was imagining what would happen if we treat _everything_ in the two
> directories being compared by "difftool --dir-diff --no-index" as if it
> is tracked.
Isn't this exactly
701 - 800 of 7666 matches
Mail list logo
