Antw: Re: Q: git describe --always --tags .. gives "warning: tag 'tag1' is really 'tag2' here"

2019-06-02 Thread Ulrich Windl
>>> Junio C Hamano schrieb am 29.05.2019 um 20:01 in Nachricht : > "Ulrich Windl" writes: > >> So I got the response: >> warning: tag 'isredir‑0.3.0' is really 'iredir‑0.3.0' here >> isredir‑0.3.0‑3‑gaf467c7 > > I suspect that "git cat‑file tag isredir‑0.3.0" would begin like > > $ git c

Re: change inside PR not reflected in the resulting squash commit

2019-06-02 Thread Philip Oakley
Hi Maliachi, It's a quiet night. I'll have a go... I have spaced out your text.. On 31/05/2019 22:03, ARAM MALIACHI wrote: I’m an Azure DevOps support engineer for Microsoft. Prior to composing this communication to the Git team I had a conversation with the Product Group from Azure DevOps stati

Re: What's cooking in git.git (May 2019, #05; Thu, 30)

2019-06-02 Thread Philip Oakley
On 31/05/2019 18:34, Junio C Hamano wrote: * po/git-help-on-git-itself (2019-05-16) 2 commits - Doc: git.txt: remove backticks from link and add git-scm.com/docs - git.c: show usage for accessing the git(1) help page "git help git" was hard to discover (well, at least for some people).

[Proposal] git am --check

2019-06-02 Thread Drew DeVault
This flag would behave similarly to git apply --check, or in other words would exit with a nonzero status if the patch is not applicable without actually applying the patch otherwise. Rationale: I'm working on an email client which has some git integration, and when you scroll over a patch I want

Re: git archive generates tar with malformed pax extended attribute

2019-06-02 Thread René Scharfe
Am 30.05.19 um 13:55 schrieb Jeff King: > On Wed, May 29, 2019 at 07:54:44PM +0200, René Scharfe wrote: > >> Am 29.05.19 um 03:17 schrieb Jeff King: >>> But here the problem is in the tree, not the blob. So we're not finding >>> suspect blobs, but rather re-checking each tree. And no matter what we

[PATCH] i18n: fix typos found during l10n for git 2.22.0

2019-06-02 Thread Jiang Xin
Find two typos introduced by the following commits: + 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24) + ed8b4132c8 (remote-curl: mark all error messages for translation, 2019-03-05) Signed-off-by: Jiang Xin --- diff.c| 2 +- remote-curl.c | 4 ++-- 2 files changed,

Re: cc/list-objects-filter-wo-sparse-path, was Re: What's cooking in git.git (May 2019, #05; Thu, 30)

2019-06-02 Thread Jiang Xin
Johannes Schindelin 于2019年6月1日周六 上午4:26写道: > > 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:

RE: [ANNOUNCE] Git v2.22.0-rc2

2019-06-02 Thread Randall S. Becker
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 platform. t0021 has been a bit flakey in the past, but not recently. Just

Re: [PATCH] add -p: coalesce hunks before testing applicability

2019-06-02 Thread Phillip Wood
Hi Dscho Sorry it's taken me so long to get round to replying to this On 22/03/2019 14:06, Johannes Schindelin wrote: Hi, On Thu, 13 Sep 2018, Phillip Wood wrote: On 03/09/2018 20:01, Jochen Sprickerhof wrote: * Phillip Wood [2018-08-30 14:47]: When $newhunk is created it is marked as d

Re: SHA-accelerated Git

2019-06-02 Thread Jeffrey Walton
On Sun, Jun 2, 2019 at 7:21 AM Michal Suchánek wrote: > > Hello, > > On Sun, 2 Jun 2019 06:43:07 -0400 > Jeffrey Walton wrote: > > > Hi Everyone, > > > > I have a lot of experience with cutting in SHA acceleration. I have no > > experience with Git. > > sha1 is dead. Git is planning to move away

Re: Travis not looking so good

2019-06-02 Thread SZEDER Gábor
On Sat, Jun 01, 2019 at 12:41:43AM +, brian m. carlson wrote: > On 2019-05-30 at 19:32:41, Johannes Schindelin wrote: > > 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

Re: SHA-accelerated Git

2019-06-02 Thread Michal Suchánek
Hello, On Sun, 2 Jun 2019 06:43:07 -0400 Jeffrey Walton wrote: > Hi Everyone, > > I have a lot of experience with cutting in SHA acceleration. I have no > experience with Git. sha1 is dead. Git is planning to move away from it. It will not happen overnight but it probably does not make sense t

Re: Why is there still git-rebase--am.sh?

2019-06-02 Thread Philip Oakley
Hi Alban, On 02/06/2019 12:04, Alban Gruin wrote: Hi, I was wandering in rebase’s source code, and found out that even though run_specific_rebase() no longer calls git-rebase--am.sh since 21853626ea ("built-in rebase: call `git am` directly", 2019-01-18), this commit did not remove the code to

Why is there still git-rebase--am.sh?

2019-06-02 Thread Alban Gruin
Hi, I was wandering in rebase’s source code, and found out that even though run_specific_rebase() no longer calls git-rebase--am.sh since 21853626ea ("built-in rebase: call `git am` directly", 2019-01-18), this commit did not remove the code to call it. I guess it was an oversight. Now that g

SHA-accelerated Git

2019-06-02 Thread Jeffrey Walton
Hi Everyone, I have a lot of experience with cutting in SHA acceleration. I have no experience with Git. If someone would setup a fork and provide a call like: // https://github.com/torvalds/linux/blob/master/arch/x86/include/asm/cpufeature.h // Or whatever the project prefers has_x

Re: Occasional git p4 test failures because of stray fast-import processes

2019-06-02 Thread SZEDER Gábor
On Wed, Feb 27, 2019 at 03:03:30PM +, Luke Diamand wrote: > On Wed, 27 Feb 2019 at 09:49, SZEDER Gábor wrote: > > I saw rare failures in test 6 'git p4 sync uninitialized repo' in > > 't9800-git-p4-basic.sh' on Travis CI, because the 'cleanup_git' > > function failed to do its job. The (redac

[PATCH] make slash-rules more readable

2019-06-02 Thread Dr. Adam Nielsen
gitignore.txt: make slash-rules more readable Remove meta-rule in a paragraph for trailing-slash. Be precise whenever a trailing slash would make a difference. Improve or add paragraphs relevant for pattern with slash. Add some slash examples in example section. Signed-off-by: Dr. Adam Nielsen

Re: [PATCH] make slash-rules more readable

2019-06-02 Thread Dr. Adam Nielsen
Hi Philip, On 01.06.19 11:33, Philip Oakley wrote: From a user perspective, implementation issues shouldn't be part of the description unless absolutely essential. Most user aren't aware of the implementation so don't grok/understand what the fuss is about and ignore it... I agree with tha

Re: [RFC PATCH] doc: change 'The standard email format' to 'The standard date format'

2019-06-02 Thread Eric Sunshine
On Sat, Jun 1, 2019 at 4:12 PM Victory Osikwemhe wrote: > The current content of date-formats.txt under the RFC 2822 section > specifies 'The standard email format' whereas the format specified > is a date format > > Signed-off-by: Victory Osikwemhe > --- > diff --git a/Documentation/date-formats

Re: worktree add already exists

2019-06-02 Thread Eric Sunshine
On Mon, May 27, 2019 at 11:32 AM Ingo Wolf wrote: > $ ls -a barework > ./ ../ test.txt > $ git -C bare worktree add --no-checkout ../barework > Preparing worktree (new branch 'barework') > fatal: '../barework' already exists > $ git -C bare branch >barework > * master > Why this doesn't just