GREAT ILLUMINATI SOCIETY

The Illuminati operates in defense of you and all humans, in all places, and of all generations. Our duty to this planet has spanned across centuries and survived even the most established government entities. But the cultivation of trillions of human lives is a daunting responsibility, and

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

Hi Junio & Paul, On Mon, 26 Nov 2018, Junio C Hamano wrote: > Paul-Sebastian Ungureanu writes: > > > The old shell script `git-stash.sh` was removed and replaced > > entirely by `builtin/stash.c`. In order to do that, `create` and > > `push` were adapted to work without `stash.sh`. For

Re: [PATCH v11 03/22] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

Hi, On Sun, 25 Nov 2018, Thomas Gummerer wrote: > On 11/23, Paul-Sebastian Ungureanu wrote: > > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to > > insert data using a printf format string. > > > > Original-idea-by: Johannes Schindelin > > Signed-off-by: Paul-Sebastian Ungureanu > >

Git for Windows v2.19.2 demoted to "pre-release"

Team, sorry for the inconvenience, but I had to "pull" Git for Windows v2.19.2 because of two major bugs: 32-bit Git Bash simply failed to start, and all operations using git:// URLs were broken. This close to v2.20.0, I was uncomfortable pushing yet another upgrade to users that would have been

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

Hi Junio, On Tue, 27 Nov 2018, Junio C Hamano wrote: > Steven Penny writes: > > > If you strip the drive, you can still navigate within the same drive: > > > > $ cd 'C:\Users' > > $ pwd > > /cygdrive/c/Users > > > > $ cd '\Windows' > > $ pwd > > /cygdrive/c/Windows > >

Re: [RFC PATCH] Introduce "precious" file concept

On Tue, Nov 27, 2018 at 1:45 AM Per Lundberg wrote: > > On 11/26/18 5:55 PM, Duy Nguyen wrote: > > On Mon, Nov 26, 2018 at 4:47 PM Ævar Arnfjörð Bjarmason > > wrote: > >> Some of the solutions overlap with this thing you want, but I think it's > >> worth keeping the distinction between the two

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

Hi Torsten, On Mon, 26 Nov 2018, tbo...@web.de wrote: > diff --git a/compat/cygwin.c b/compat/cygwin.c > index b9862d606d..c4a10cb5a1 100644 > --- a/compat/cygwin.c > +++ b/compat/cygwin.c > @@ -1,19 +1,29 @@ > #include "../git-compat-util.h" > #include "../cache.h" > > +int

[no subject]

We need to make sure everyone's contact information is up to date, please login with your corporate login and verify the information is correct: Click here We need to have this list updated within 24hrs, so please make this a priority. Thank You

[PATCH 1/1] rebase --stat: fix when rebasing to an unrelated history

From: Johannes Schindelin When rebasing to a commit history that has no common commits with the current branch, there is no merge base. The scripted version of the `git rebase` command was not prepared for that and spewed out fatal: ambiguous argument '': unknown revision or path not in

[PATCH 0/1] Fix git rebase --stat -i

We're really entering obscure territory here, I would say. To trigger the bug, two things have to come together: the user must have asked for a diffstat afterwards, and the commits need to have been rebased onto a completely unrelated commit history (i.e. there must exist no merge base between

HELLO

Assalamu alaikum, I have a business Proposal for you and I need mutual respect, trust, honesty, transparency, adequate support and assistance, Hope to hear from you for more details. Warmest regards Mrs Aisha Gaddafi السلام عليكم، لدي اقتراح عمل لك وأنا بحاجة إلى الاحترام المتبادل والثقة

Re: [PATCH] config.mak.dev: enable -Wpedantic in clang

On Tue, Nov 27, 2018 at 5:06 AM Carlo Marcelo Arenas Belón wrote: > [...] > -Wpedantic is only enabled for clang 10 or higher (only available in macOS > with latest Xcode) but this restriction should be relaxed further as more > environments are tested We know from [1] that the clang version

[PATCH] config.mak.dev: enable -Wpedantic in clang

DEVOPTS=pedantic adds -pedantic to the compiler flags, but misses on some diagnostics when using clang, and that are only enabled with -Wpedantic 46c0eb5843 ("files-backend.c: fix build error on Solaris", 2018-11-25) fixes an issue that was visible also with gcc but not clang so correct that with

Re: [RFC PATCH] Introduce "precious" file concept

On 11/26/18 5:55 PM, Duy Nguyen wrote: > On Mon, Nov 26, 2018 at 4:47 PM Ævar Arnfjörð Bjarmason > wrote: >> Some of the solutions overlap with this thing you want, but I think it's >> worth keeping the distinction between the two in mind. > > On the other hand all use cases should be

PLEASE OPEN ATTACH

From. Mr. Daniel and Brother Emmanuel Simba Email: danielsimba...@gmail.com Telephone number: +27 782641230 PLEASE OPEN ATTACH FOR THE PROPOSAL THANKS AND GOD BLESS YOU Mr. Daniel and Brother Emmanuel Simba (FOR THE FAMILY) From Daniel.docx Description: MS-Word 2007 document

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

On Mon, Nov 26, 2018 at 11:23 PM Junio C Hamano wrote: > Sorry, but I do not see the connection to this question and the > above example. The reason why we strip C: is because the letter > that comes after that colon determines if we are talking about > absolute path (in other words, the current

Re: [PATCH] pack-protocol.txt: accept error packets in any context

Masaya Suzuki writes: > In the Git pack protocol definition, an error packet may appear only in > a certain context. However, servers can face a runtime error (e.g. I/O > error) at an arbitrary timing. This patch changes the protocol to allow > an error packet to be sent instead of any packet.

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

Steven Penny writes: > If you strip the drive, you can still navigate within the same drive: > > $ cd 'C:\Users' > $ pwd > /cygdrive/c/Users > > $ cd '\Windows' > $ pwd > /cygdrive/c/Windows > > but you can no longer traverse drives: > > $ cd '\Testing' > sh: cd:

[PATCH] pack-protocol.txt: accept error packets in any context

In the Git pack protocol definition, an error packet may appear only in a certain context. However, servers can face a runtime error (e.g. I/O error) at an arbitrary timing. This patch changes the protocol to allow an error packet to be sent instead of any packet. Following this protocol spec

Re: [RFC PATCH v2] Add 'human' date format

On Saturday, July 7, 2018 3:02:35 PM MST Linus Torvalds wrote: > From: Linus Torvalds > > This adds --date=human, which skips the timezone if it matches the > current time-zone, and doesn't print the whole date if that matches (ie > skip printing year for dates that are "this year", but also

From Mr.Frank Yacouba

With due respect, Please forgive me for stressing you with my business as I know that this letter may come to you as big surprise. Truly, I came across your contact email address through my personal search, then afterward I decided to email you directly believing that you will be honest to help

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

On Mon, Nov 26, 2018 at 7:16 PM Junio C Hamano wrote: > I wonder if it makes the rest of the code simpler if we stripped > things like /cygdrive/c here exactly the sam way as we strip C: > For that, has_dos_drive_prefix() needs to know /cygdrive/[a-z], > which may not be a bad thing, I guess.

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

tbo...@web.de writes: > Reported-By: Steven Penny > Signed-off-by: Torsten Bögershausen > --- > > This is the first vesion of a patch. > Is there a chance that you test it ? > > abspath.c | 2 +- > compat/cygwin.c | 18 ++ > compat/cygwin.h | 32

Re: [PATCH v1 1/2] log -G: Ignore binary files

Stefan Beller writes: > On Wed, Nov 21, 2018 at 1:08 PM Thomas Braun > wrote: >> >> The -G option of log looks for the differences whose patch text >> contains added/removed lines that match regex. >> >> The concept of differences only makes sense for text files, therefore >> we need to ignore

Re: [PATCH 2/5] ieot: default to not writing IEOT section

Stefan Beller writes: >> > +static int record_ieot(void) >> > +{ >> > + int val; >> > + >> >> Initialize stack val to zero to ensure proper default. > > I don't think that is needed here, as we only use `val` when > we first write to it via git_config_get_bool. Yup.

Re: [ANNOUNCE] Git v2.20.0-rc1

Elijah Newren writes: > If we don't set rebase.useBuiltin to false, then there is also a minor > regression in the error message printed by the built-in rebase we may > want to try to address. I have a patch for it at > <20181122044841.20993-2-new...@gmail.com>, but I don't know if that > patch

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

Stefan Beller writes: > Maybe we need to step back and consider what the command does. > And from that I would name it "rewire-HEAD-and-update-index" > and then simplify from there. For the beginner user, the concept of > HEAD might be overwhelming, such that we don't want to have that > in

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

On Mon, Nov 26, 2018 at 11:32 AM wrote: > This is the first vesion of a patch. > Is there a chance that you test it ? I can confirm that this fixes the issue. Thank you!

Re: Confusing behavior with ignored submodules and `git commit -a`

On Thu, Nov 15, 2018 at 4:31 PM Michael Forney wrote: > > On 2018-11-15, Stefan Beller wrote: > > On Thu, Nov 15, 2018 at 1:33 PM Michael Forney wrote: > >> Well, currently the submodule config can be disabled in diff_flags by > >> setting override_submodule_config=1. However, I'm thinking it

Re: [ANNOUNCE] Git v2.20.0-rc1

Hi Ævar, On Mon, 26 Nov 2018, Johannes Schindelin wrote: > On Sat, 24 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > 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

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

Stefan Beller writes: >> * sb/submodule-recursive-fetch-gets-the-tip (2018-10-31) 11 commits >> [...] >> >> "git fetch --recurse-submodules" may not fetch the necessary commit >> that is bound to the superproject, which is getting corrected. >> >> Is the discussion on this topic over? What

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

Johannes Sixt writes: > Am 26.11.18 um 04:04 schrieb Junio C Hamano: >> >> That does not sound right. I would understand it if both lines >> showed ^M at the end, and only the one on the postimage line had it >> highlighted as a trailing-whitespace. > > I agree that this is a (small?) weakness.

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

On Mon, Nov 26, 2018 at 8:01 AM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Nov 20 2018, Duy Nguyen wrote: > > > On Mon, Nov 19, 2018 at 04:19:53PM +0100, Duy Nguyen wrote: > >> I promise to come back with something better (at least it still > >> sounds better in my mind). If that idea does not

Re: [ANNOUNCE] Git v2.20.0-rc1

Hi Ævar, On Sat, 24 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > 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

Re: [PATCH 2/5] ieot: default to not writing IEOT section

On Mon, Nov 26, 2018 at 1:48 PM Ben Peart wrote: > > > > On 11/26/2018 2:59 PM, Stefan Beller wrote: > >>> +static int record_ieot(void) > >>> +{ > >>> + int val; > >>> + > >> > >> Initialize stack val to zero to ensure proper default. > > > > I don't think that is needed here, as we only use

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

> > * sb/submodule-recursive-fetch-gets-the-tip (2018-10-31) 11 commits > [...] > > "git fetch --recurse-submodules" may not fetch the necessary commit > that is bound to the superproject, which is getting corrected. > > Is the discussion on this topic over? What was the outcome? Please don't

Re: [PATCH 2/5] ieot: default to not writing IEOT section

On 11/26/2018 2:59 PM, Stefan Beller wrote: +static int record_ieot(void) +{ + int val; + Initialize stack val to zero to ensure proper default. I don't think that is needed here, as we only use `val` when we first write to it via git_config_get_bool. Did you spot this via code

Re: [PATCH v2 0/9] diff --color-moved-ws fixes and enhancment

On Fri, Nov 23, 2018 at 3:17 AM Phillip Wood wrote: > > From: Phillip Wood > > Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8 in > response to those comments - see the range-diff below for details (the > patch numbers are off by one in the range diff, I think because the >

Re: [PATCH v1 1/2] log -G: Ignore binary files

On Wed, Nov 21, 2018 at 1:08 PM Thomas Braun wrote: > > The -G option of log looks for the differences whose patch text > contains added/removed lines that match regex. > > The concept of differences only makes sense for text files, therefore > we need to ignore binary files when searching with

[PATCH] t/lib-git-daemon: fix signal checking

Test scripts checking 'git daemon' stop the daemon with a TERM signal, and the 'stop_git_daemon' helper checks the daemon's exit status to make sure that it indeed died because of that signal. This check is bogus since 03c39b3458 (t/lib-git-daemon: use test_match_signal, 2016-06-24), for two

Re: [PATCH 2/5] ieot: default to not writing IEOT section

> > +static int record_ieot(void) > > +{ > > + int val; > > + > > Initialize stack val to zero to ensure proper default. I don't think that is needed here, as we only use `val` when we first write to it via git_config_get_bool. Did you spot this via code review and thought of defensive

[PATCH] transport-helper.c: do not translate a string twice

Signed-off-by: Nguyễn Thái Ngọc Duy --- My bad. transport-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index 7213fa0d32..bf225c698f 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -573,7 +573,7 @@ static int

Re: [PATCH] grep: use grep_opt->repo instead of explict repo argument

On Sun, Nov 18, 2018 at 8:38 AM Nguyễn Thái Ngọc Duy wrote: > > This command is probably the first one that operates on a repository > other than the_repository, in f9ee2fcdfa (grep: recurse in-process > using 'struct repository' - 2017-08-02). An explicit 'struct > repository *' was added in

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

Am 26.11.18 um 04:04 schrieb Junio C Hamano: It appears to me that what Frank sees is not "^M highlighted for whitespace breakage appears only on postimage lines, while ^M is shown but not highlighted on preimage lines". My reading of the above is "Not just without highlight, ^M is just *NOT*

[PATCH v2 1/2] Introduce "precious" file concept

A new attribute "precious" is added to indicate that certain files have valuable content and should not be easily discarded even if they are ignored or untracked. So far there are two parts of Git that are made aware of precious files: "git clean" will leave precious files alone and

[PATCH v2 2/2] unpack-trees: support core.allIgnoredFilesArePreciousWhenMerging

Ignored files can be marked precious to prevent being overwritten during a merge (or even a branch switch). If you really want to make sure no ignored files are overwritten, this config variable is for you. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config/core.txt | 6 ++

[PATCH v2 0/2] Precios files round two

Let's see if I can make everybody almost happy with this. Patch 1 is not that much different from round one except now with tests. It is still about "precious" attributes that prevent content loss with "git clean", "git checkout " or "git merge". Patch 2 goes Ævar and Per are pursuing. It adds

Re: Did You Receive My Last Mail?

Hello, My name is ms. Reem Al-Hashimi. The UAE minister of state for international cooparation. I got your contact from an email database from your country. I have a financial transaction i would like to discuss with you. Please reply to reem2...@daum.net, for more details if you are

Re: [PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

Hi Martin, On Fri, 23 Nov 2018, Martin Ågren wrote: > On Fri, 23 Nov 2018 at 11:13, Johannes Schindelin > wrote: > > On Mon, 30 Oct 2017, Pranit Bauva wrote: > > > > > On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren > > > wrote: > > > > On 27 October 2017 at 17:06, Pranit Bauva > > > >

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

On Sun, Nov 25, 2018 at 11:02:05AM +0900, Junio C Hamano wrote: > 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

[PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

From: Torsten Bögershausen A regression for cygwin users was introduced with commit 05b458c, "real_path: resolve symlinks by hand". In the the commit message we read: The current implementation of real_path uses chdir() in order to resolve symlinks. Unfortunately this isn't thread-safe as

Re: [PATCH v2 0/4] Port git-add--interactive.perl:status_cmd to C

Hi Daniel, On 16-May-17 6:00 AM, Daniel Ferreira wrote: This is the second version of a patch series to start porting git-add--interactive from Perl to C. Series: v1: https://public-inbox.org/git/1494009820-2090-1-git-send-email-bnm...@gmail.com/ Travis CI build:

Re: t5570 shaky for anyone ?

On Sun, Nov 25, 2018 at 11:22:47PM +0100, SZEDER Gábor wrote: > > The following fixes it, but I am not sure if this is the ideal > > solution. > > Currently this is the only test that looks at 'daemon.log', but if we > ever going to add another one, then that will be prone to the same > issue. >

Re: t5570 shaky for anyone ?

On Sun, Nov 25, 2018 at 10:01:38PM +, Thomas Gummerer wrote: > On 11/25, Torsten Bögershausen wrote: > > After running the "Git 2.20-rc1" testsuite here on a raspi, > > the only TC that failed was t5570. > > When the "grep" was run on daemon.log, the file was empty (?). > > When inspecting

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

On Mon, Nov 26, 2018 at 5:01 PM Ævar Arnfjörð Bjarmason wrote: > > So, what do you think? > > That "git checkout" does too many things is something that keeps coming > up in online discussions about Git's UI. Two things: > > a) It would really help to have some comparison of cases where these >

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 12, 2018 at 11:22:09PM +, brian m. carlson wrote: > This is going to totally hose automation. My last job had files which > might move from tracked to untracked (a file that had become generated), > and long-running CI and build systems would need to be able to check out > one

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

On Tue, Nov 20 2018, Duy Nguyen wrote: > On Mon, Nov 19, 2018 at 04:19:53PM +0100, Duy Nguyen wrote: >> I promise to come back with something better (at least it still >> sounds better in my mind). If that idea does not work out, we can >> come back and see if we can improve this. > > So this

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26, 2018 at 4:47 PM Ævar Arnfjörð Bjarmason wrote: > >> >> How about something like this: > >> >> > >> >> 1. Introduce a concept with "garbage" files, which git is "permitted to > >> >> delete" without prompting. > >> >> > >> >> 2. Retain the current default, i.e. "ignored files are

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26 2018, Duy Nguyen wrote: > On Mon, Nov 26, 2018 at 4:34 PM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Mon, Nov 26 2018, Duy Nguyen wrote: >> >> > On Mon, Nov 26, 2018 at 10:30 AM Per Lundberg >> > wrote: >> >> >> >> On 11/13/18 1:22 AM, brian m. carlson wrote: >> >> > This is

Re: [RFC PATCH 0/7] test: NetBSD support

On Sun, Nov 25 2018, Carlo Marcelo Arenas Belón wrote: > Likely still missing changes as it only completes a run with a minimal > number of dependencies but open for feedback > > Requires pkgsrc packages for gmake, perl, bash and curl and completes a run > > $ gmake

Re: [ANNOUNCE] Git v2.20.0-rc1

On Sun, Nov 25, 2018 at 11:37 PM Junio C Hamano wrote: > > Unless I hear otherwise in the next 24 hours, I am planning to > merge the following topics to 'master' before cutting -rc2. Please > stop me on any of these topics. > > - jc/postpone-rebase-in-c > >This may be the most

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26, 2018 at 4:34 PM Ævar Arnfjörð Bjarmason wrote: > > > On Mon, Nov 26 2018, Duy Nguyen wrote: > > > On Mon, Nov 26, 2018 at 10:30 AM Per Lundberg wrote: > >> > >> On 11/13/18 1:22 AM, brian m. carlson wrote: > >> > This is going to totally hose automation. My last job had files

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

On Mon, Nov 26, 2018 at 4:03 AM Junio C Hamano wrote: > > Thomas Gummerer writes: > > > I like the idea of splitting those commands up, in fact it is > > something I've been considering working on myself. I do think we > > should consider if we want to change the behaviour of those new > >

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26 2018, Duy Nguyen wrote: > On Mon, Nov 26, 2018 at 10:30 AM Per Lundberg wrote: >> >> On 11/13/18 1:22 AM, brian m. carlson wrote: >> > This is going to totally hose automation. My last job had files which >> > might move from tracked to untracked (a file that had become

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26, 2018 at 10:30 AM Per Lundberg wrote: > > On 11/13/18 1:22 AM, brian m. carlson wrote: > > This is going to totally hose automation. My last job had files which > > might move from tracked to untracked (a file that had become generated), > > and long-running CI and build systems

Re: git bash lunching error

On Mon, Nov 26, 2018 at 08:32:27PM +0530, Chandra Shekhar wrote: > cess: Resource temporarily unavailable (-1). > DLL rebasing may be required; see 'rebaseall / rebase --help'. This ? Please do not post screenshots, post text. Also please

git bash lunching error

cess: Resource temporarily unavailable (-1). DLL rebasing may be required; see 'rebaseall / rebase --help'.

Re: [RFC PATCH] Introduce "precious" file concept

Per Lundberg writes: > How about something like this: > ... > Would this be a reasonable compromise for everybody? I do not think you'd need to introduce such a deliberately breaking change at all. Just introduce a new "precious" class, perhaps mark them with the atttribute mechanism, and that

Re: [RFC PATCH] Introduce "precious" file concept

On Mon, Nov 26 2018, Per Lundberg wrote: > On 11/13/18 1:22 AM, brian m. carlson wrote: >> This is going to totally hose automation. My last job had files which >> might move from tracked to untracked (a file that had become generated), >> and long-running CI and build systems would need to be

Re: [RFC PATCH] Introduce "precious" file concept

On 11/13/18 1:22 AM, brian m. carlson wrote: > This is going to totally hose automation. My last job had files which > might move from tracked to untracked (a file that had become generated), > and long-running CI and build systems would need to be able to check out > one status and switch to the

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

Anders Waldenborg writes: > Would it feel less inconsistent if it did not set the 'only_trailers' > option? If %(trailers:key=...) did not automatically imply 'only', it would be very consistent. But as I already said, I think it would be less convenient, as I do suspect that those who want

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

Junio C Hamano writes: > Thomas Gummerer writes: > >> Thanks for your work on this! I have read through the range-diff and >> the new patch of this last round, and this addresses all the comments >> I had on v10 (and some more :)). I consider it >> Reviewed-by: Thomas Gummerer > > Thanks. >

Re: [ANNOUNCE] Git v2.20.0-rc1

Unless I hear otherwise in the next 24 hours, I am planning to merge the following topics to 'master' before cutting -rc2. Please stop me on any of these topics. - jc/postpone-rebase-in-c This may be the most controversial. It demotes the C reimplementation of "git rebase" to an

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

Greg Hurrell writes: > 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:

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

Junio C Hamano writes: > I was confused by the "only" stuff. > > When you give a key (or two), they cannot possibly name non-trailer > lines, so while it may be possible to ask "oh, by the way, I also > want non-trailer lines in addition to signed-off-by and cc lines", > the value of being able

Re: [RFC PATCH 7/7] config.mak.uname: use pkgsrc perl for NetBSD

Carlo Marcelo Arenas Belón writes: > otherwise will default to /usr/bin/perl which wouldn't normally exist > > Signed-off-by: Carlo Marcelo Arenas Belón > --- > config.mak.uname | 1 + > 1 file changed, 1 insertion(+) I do not have experience with NetBSD so I take your words on face value.

Re: [RFC PATCH 6/7] t5004: use GNU tar to avoid known issues with BSD tar

Carlo Marcelo Arenas Belón writes: > 56ee96572a ("t5004: resurrect original empty tar archive test", 2013-05-09) > added a test to try to detect and workaround issues with the standard tar > from BSD, but at least in NetBSD would be better to instead require GNU tar > which is available from

Re: [RFC PATCH 5/7] test-lib: use pkgsrc provided unzip for NetBSD

Carlo Marcelo Arenas Belón writes: > d98b2c5fce ("test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/", > 2016-07-21) added an exception to the test suite for FreeBSD because the > tests assume functionality not provided by its base unzip tool. > > NetBSD shares that limitation and

Re: [RFC PATCH 4/7] config.mak.uname: NetBSD uses old iconv interface

Carlo Marcelo Arenas Belón writes: > prevents the following warning : s/^/Doing so / or something to make it a complete sentence. > ... > it is set by optional configure at least since NetBSD 6.0 s/it/It/; Again, makes sense, and thanks for tying this loose end. > Signed-off-by: Carlo

Re: [RFC PATCH 3/7] config.mak.uname: NetBSD uses BSD semantics with fread for directories

Carlo Marcelo Arenas Belón writes: > this "fixes" test 23 (proper error on directory "files") from t1308 > > other BSD (OpenBSD, MirBSD) likely also affected but they will be > fixed in a different series > > the optional 'configure' sets this automatically and is probably what > most users

Re: [RFC PATCH 2/7] t0301: remove trailing / for dir creation

Carlo Marcelo Arenas Belón writes: > the semantics of how mkdir -p should work, specially when using -m are > not standard and in this case NetBSD will assume that the permision > should not be changed, breaking the test This does not explain, except for the fuzzy "in this case", why we want

Re: [RFC PATCH 1/7] Documentation: update INSTALL for NetBSD

Carlo Marcelo Arenas Belón writes: > NetBSD added a BSD licensed reimplementation of GNU libintl to > its base at least since release 4.0 (mid 2012) and git can be > configured to build with it. > > Signed-off-by: Carlo Marcelo Arenas Belón > --- > INSTALL | 6 +++--- > 1 file changed, 3

[PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

Junio C Hamano writes: > Æ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

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

Thomas Gummerer writes: > Thanks for your work on this! I have read through the range-diff and > the new patch of this last round, and this addresses all the comments > I had on v10 (and some more :)). I consider it > Reviewed-by: Thomas Gummerer Thanks. One thing that bothers me is that

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

Paul-Sebastian Ungureanu writes: > The old shell script `git-stash.sh` was removed and replaced > entirely by `builtin/stash.c`. In order to do that, `create` and > `push` were adapted to work without `stash.sh`. For example, before > this commit, `git stash create` called `git stash--helper

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

Carlo Arenas writes: > Signed-off-by: Carlo Marcelo Arenas Belón Do you mean Tested-by: (meaning, you actually saw the breakage with SunCC without the patch and also saw the patch fixed the breakage)? > clang with -Wpedantic also catch this (at least with Apple LLVM > version 10.0.0); recent

Re: [PATCH] setup.c: remove needless argument passed to open in sanitize_stdfds

pedrodel...@gmail.com writes: > According to POSIX manual pages, the open() system call's mode > argument specifies the file mode bits to be applied when a new > file is created. If neither O_CREAT nor O_TMPFILE is specified, > then mode is ignored. Correct. While I would say two argument

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

Johannes Sixt writes: > But incorrect whitespace is never highlighted in removed lines, why > should CR be an exception? > ... > Same here for other cases, for example > > -something > +something > > will not have on obvious indicator that whitespace was corrected. All correct, but misses one

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

Anders Waldenborg writes: > Junio C Hamano writes: >> Also, use of 'key=' automatically turns on 'only' as described, and >> I tend to agree that it would a convenient default mode (i.e. when >> picking certain trailers only with this mechanism, it is likely that >> the user is willing to use

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

Thomas Gummerer writes: > I like the idea of splitting those commands up, in fact it is > something I've been considering working on myself. I do think we > should consider if we want to change the behaviour of those new > commands in any way compared to 'git checkout', since we're starting >

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

Max Kirillov writes: > If http-backend dies because of errors, started upload-pack or > receive-pack are not killed and waited, but rather stay running for somtime "sometime" (will fix locally, no reason for a resend). > until they exits because of closed stdin. It may be undesirable in

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

Max Kirillov writes: > 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 > +++

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

On Sun, Nov 25, 2018 at 03:03:11PM +0100, Frank Schäfer wrote: > Am 24.11.18 um 23:07 schrieb Johannes Sixt: > > I don't think that there is anything to fix. If you have a file with > > CRLF in it, but you did not declare to Git that CRLF is the expected > > end-of-line indicator, then the CR *is*

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

Junio C Hamano writes: > Also, use of 'key=' automatically turns on 'only' as described, and > I tend to agree that it would a convenient default mode (i.e. when > picking certain trailers only with this mechanism, it is likely that > the user is willing to use %(subject) etc. to fill in what

Re: t5570 shaky for anyone ?

On Sun, Nov 25, 2018 at 09:52:23PM +0100, Torsten Bögershausen wrote: > After running the "Git 2.20-rc1" testsuite here on a raspi, > the only TC that failed was t5570. > When the "grep" was run on daemon.log, the file was empty (?). > When inspecting it later, it was filled, and grep would have

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

On 11/20, Duy Nguyen wrote: > On Mon, Nov 19, 2018 at 04:19:53PM +0100, Duy Nguyen wrote: > > I promise to come back with something better (at least it still > > sounds better in my mind). If that idea does not work out, we can > > come back and see if we can improve this. > > So this is it. The

Re: t5570 shaky for anyone ?

On 11/25, Torsten Bögershausen wrote: > After running the "Git 2.20-rc1" testsuite here on a raspi, > the only TC that failed was t5570. > When the "grep" was run on daemon.log, the file was empty (?). > When inspecting it later, it was filled, and grep would have found > the "extended.attribute"

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

On 11/23, Paul-Sebastian Ungureanu wrote: > Hello, > > This is the 11th iteration of C git stash. Here are some of the changes, > based on Thomas's and dscho's suggestions (from mailing list / pull request > #495): Thanks for your work on this! I have read through the range-diff and the new

Re: [PATCH v11 03/22] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

On 11/23, Paul-Sebastian Ungureanu wrote: > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to > insert data using a printf format string. > > Original-idea-by: Johannes Schindelin > Signed-off-by: Paul-Sebastian Ungureanu > --- > strbuf.c | 36 >

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

Am 25.11.18 um 15:03 schrieb Frank Schäfer: Am 24.11.18 um 23:07 schrieb Johannes Sixt: I don't think that there is anything to fix. If you have a file with CRLF in it, but you did not declare to Git that CRLF is the expected end-of-line indicator, then the CR *is* trailing whitespace (because

<    3   4   5   6   7   8   9   10   11   12   >