[PATCH] files-backend.c: fix build error on Solaris

2018-11-24 Thread Nguyễn Thái Ngọc Duy
This function files_reflog_path returns void, which usually means "return;" not returning "void value" from another function. Reported-by: Ævar Arnfjörð Bjarmason Signed-off-by: Nguyễn Thái Ngọc Duy --- refs/files-backend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-11-24 Thread Torsten Bögershausen
On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Sep 05 2018, Eric Sunshine wrote: [] > > SunCC used to be ahead of GCC & Clang when it came to certain classes of > > warnings, but e.g. now everything

Re: git overwriting local ignored files?

2018-11-24 Thread David Mandelberg
On 11/24/18 10:41 AM, Konstantin Khomoutov wrote: On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote: On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote: It seems that git is overwriting my local files on merge if they're in .gitignore. [...] The .gitignore

Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-24 Thread Junio C Hamano
Jeff King writes: > I do also think in the long run we should be fixing the "unreachable > always become loose" issues. I think I've seen an idea of collecting them into a garbage pack floated for at least a few times here. What are the downsides? We no longer will know when these unreachable

Re: [PATCH v3 3/8] refs: new ref types to make per-worktree refs visible to all worktrees

2018-11-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Sun, Oct 21 2018, Nguyễn Thái Ngọc Duy wrote: > > This change has a regression in 2.20: > >> [...] >> static void files_reflog_path(struct files_ref_store *refs, >>struct strbuf *sb, >>const char

Re: How to efficiently backup a bare repository?

2018-11-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > There's no easy out of the box way to do exactly what you've > described. A few things come to mind: > ... Wouldn't it suffice to have a cron job that runs something like D=$(date +"%Y-%m-%d") git fetch $serving "refs/*:refs/backup-$D/*" on

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> * "git rebase" and "git rebase -i" have been reimplemented in C. > > Here's another regression in the C version (and rc1),... > I wasn't trying to stress test rebase. I was just wanting to rebase a > history I was about to force-push after cleaning it up,

Re: How to efficiently backup a bare repository?

2018-11-24 Thread Ævar Arnfjörð Bjarmason
On Fri, Nov 23 2018, Guilhem Bonnefille wrote: > I'm managing many bare repositories for development teams. > > One service we want to offer is to let developers retrieve old state > of the repository up to 30 days. For example, one developer > (accidently) removed (push -f) a branch/tag and

GCC Compile farm (Linux, Solaris, AIX etc.) testing of git.git

2018-11-24 Thread Ævar Arnfjörð Bjarmason
I've had access to the GCC Compile Farm for testing on various architectures for a while. Around the 2.19.0 release I submitted some patches / bug reports found there. I've now improved this to run it via GitLab CI & made the output accessible. Outline of how this works at

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-24 Thread Johannes Sixt
Am 24.11.18 um 15:51 schrieb Frank Schäfer: Am 23.11.18 um 22:47 schrieb Johannes Sixt: Am 23.11.18 um 19:19 schrieb Frank Schäfer: The CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF. It shows up as expected in '-' lines when the ending of the

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 21 2018, Junio C Hamano wrote: > * "git rebase" and "git rebase -i" have been reimplemented in C. Here's another regression in the C version (and rc1), note: the sha1collisiondetection is just a stand in for "some repo": ( rm -rf /tmp/repo && git init

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-11-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote: > On Wed, Sep 05 2018, Eric Sunshine wrote: > >> On Wed, Sep 5, 2018 at 4:29 AM Ævar Arnfjörð Bjarmason >> wrote: >>> I recently gained access to a Solaris 10 SPARC (5.10) box and discovered >>> that the chainlint.sed implementation in

Re: [PATCH v3 3/8] refs: new ref types to make per-worktree refs visible to all worktrees

2018-11-24 Thread Ævar Arnfjörð Bjarmason
On Sun, Oct 21 2018, Nguyễn Thái Ngọc Duy wrote: This change has a regression in 2.20: > [...] > static void files_reflog_path(struct files_ref_store *refs, > struct strbuf *sb, > const char *refname) > @@ -158,6 +178,9 @@ static void

How to add edges to visualize cherry-picks and ported patches

2018-11-24 Thread Hartmut Goebel
Hi, I hope this is the right place for this answer. If not, plaese point me to a more appropriate place. A project  "P2" [2] forked from another project "P1" [1]  quite some time ago, both repos share a common history up to some point. After this point, P2 cherry-picked commits from P1, but did

Re: git overwriting local ignored files?

2018-11-24 Thread Konstantin Khomoutov
On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote: > On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote: > > > > > It seems that git is overwriting my local files on merge if they're in > > > > .gitignore. > [...] > > > The .gitignore file is to list "ignored and

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-24 Thread Torsten Bögershausen
On Sat, Nov 24, 2018 at 03:51:26PM +0100, Frank Schäfer wrote: [] > > Hmm... is CR-only line termination supported at all ? > E.g. 'eol' can be set to 'lf' or 'crlf' but not 'cr'... > No, CR-only is not supported, because: Nobody was implementing it, and that is probably because the only

Re: git overwriting local ignored files?

2018-11-24 Thread Konstantin Khomoutov
On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote: > > > It seems that git is overwriting my local files on merge if they're in > > > .gitignore. [...] > > The .gitignore file is to list "ignored and expendable" class of > > files; there is no "ignored but precious class" in Git. >

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-24 Thread Frank Schäfer
Am 23.11.18 um 22:47 schrieb Johannes Sixt: > Am 23.11.18 um 19:19 schrieb Frank Schäfer: >> The CR marker ^M doesn't show up in '-' lines of diffs when the ending >> of the removed line is CR+LF. >> It shows up as expected in '-' lines when the ending of the removed line >> is CR only. >> It also

Re: git overwriting local ignored files?

2018-11-24 Thread David Mandelberg
On 11/23/18 11:22 PM, Junio C Hamano wrote: David Mandelberg writes: It seems that git is overwriting my local files on merge if they're in .gitignore. See command transcript below. I searched `git help config` and Google, but I couldn't find any way to prevent it. Am I missing something?

[PATCH] http-backend: enable cleaning up forked upload/receive-pack on exit

2018-11-24 Thread Max Kirillov
If http-backend dies because of errors, started upload-pack or receive-pack are not killed and waited, but rather stay running for somtime until they exits because of closed stdin. It may be undesirable in working environment, and it also causes occasional failure of t5562, because the processes

Re: [PATCH] t5562: do not reuse output files

2018-11-24 Thread Max Kirillov
On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote: > I do agree that forcing the parent to wait, like you described in > the comment, would be far more preferrable, It looks like it can be done as simple as: --- a/http-backend.c +++ b/http-backend.c @@ -486,6 +486,8 @@ static void

Re: [PATCH] t5562: do not reuse output files

2018-11-24 Thread Jeff King
On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote: > I do agree that forcing the parent to wait, like you described in > the comment, would be far more preferrable, [...] Stray processes can sometimes have funny effects on an outer test harness, too. E.g., I think I've seen hangs

Re: [PATCH] t5562: fix perl path

2018-11-24 Thread Jeff King
On Fri, Nov 23, 2018 at 01:38:21AM +0200, Max Kirillov wrote: > From: Jeff King > > Some systems do not have perl installed to /usr/bin. Use the variable > from the build settiings, and call perl directly than via shebang. > > Signed-off-by: Max Kirillov > --- > Submitting. Could you

Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-24 Thread Jeff King
On Thu, Nov 22, 2018 at 07:36:54PM +0100, Ævar Arnfjörð Bjarmason wrote: > > Yeah, my intent had been to circle back around to this, but I just > > hadn't gotten to it. I'm still pondering a config option or similar, > > though I remain unconvinced that the cases in which you've showed it > >

Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-24 Thread Jeff King
On Sat, Nov 24, 2018 at 11:11:36AM +0900, Junio C Hamano wrote: > > However, note that the cache-load for finding abbreviations _must_ have > > the complete list. And has been loading it for some time. So if you run > > "git-fetch", for example, you've already been running this code for > >

Re: [PATCH 1/2] format-patch: add a more exhaustive --range-diff test

2018-11-24 Thread Ævar Arnfjörð Bjarmason
On Sat, Nov 24 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Change the narrow test added in 31e2617a5f ("format-patch: add >> --range-diff option to embed diff in cover letter", 2018-07-22) to >> test the full output. This test would have spotted a regression in the >>

[PATCH v3] t5562: do not reuse output files

2018-11-24 Thread Max Kirillov
Some expected failures of git-http-backend leaves running its children (receive-pack or upload-pack) which still hold opened descriptors to act.err and with some probability they live long enough to write there their failure messages after next test has already truncated the files. This causes

[PATCH] doc: update diff-format.txt for removed ellipses in --raw

2018-11-24 Thread Greg Hurrell
Since 7cb6ac1e4b ("diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value", 2017-12-03), the "--raw" format of diff does not add ellipses in an attempt to align the output, but the documentation was not updated to reflect this. Signed-off-by: Greg Hurrell --- The