[PATCH] files_initial_transaction_commit(): only unlock if locked

Running git clone --single-branch --mirror -b TAGNAME previously triggered the following error message: fatal: multiple updates for ref 'refs/tags/TAGNAME' not allowed. This error condition is handled in files_initial_transaction_commit(). 42c7f7ff9 ("commit_packed_refs(): remove call

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 08:36:32PM +0700, Duy Nguyen wrote: > On Thu, Jan 18, 2018 at 8:29 PM, Jeff King wrote: > > On Thu, Jan 18, 2018 at 07:47:50PM +0700, Duy Nguyen wrote: > > > >> I may need help getting that log (or even better the trash directory > >> of t1700). I tried -m32

[PATCH 5/8] rebase: introduce the --recreate-merges option

Once upon a time, this here developer thought: wouldn't it be nice if, say, Git for Windows' patches on top of core Git could be represented as a thicket of branches, and be rebased on top of core Git in order to maintain a cherry-pick'able set of patch series? The original attempt at an answer

[PATCH 3/8] sequencer: fast-forward merge commits, if possible

Just like with regular `pick` commands, if we are trying to recreate a merge commit, we now test whether the parents of said commit match HEAD and the commits to be merged, and fast-forward if possible. This is not only faster, but also avoids unnecessary proliferation of new objects.

[PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

The sequencer just learned a new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of these commands, triggered by the new --recreate-merges option.

[PATCH 2/8] sequencer: introduce the `merge` command

This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of upstream Git. The previous patch implemented the `label`,

[PATCH 1/8] sequencer: introduce new commands to reset the revision

In the upcoming commits, we will teach the sequencer to recreate merges. This will be done in a very different way from the unfortunate design of `git rebase --preserve-merges` (which does not allow for reordering commits, or changing the branch topology). The main idea is to introduce new todo

[PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

In the previous patches, we implemented the basic functionality of the `git rebase -i --recreate-merges` command, in particular the `merge` command to create merge commits in the sequencer. The interactive rebase is a lot more these days, though, than a simple cherry-pick in a loop. For example,

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 8:29 PM, Jeff King wrote: > On Thu, Jan 18, 2018 at 07:47:50PM +0700, Duy Nguyen wrote: > >> I may need help getting that log (or even better the trash directory >> of t1700). I tried -m32 build, then valgrind on amd64 (because it >> didn't work with my 32

Re: [PATCH v2] packfile: use get_be64() for large offsets

Junio, > The pack-index version 2 format uses two 4-byte integers in network- > byte order to represent one 8-byte value. The current implementation > has several code clones for stitching these integers together. > > Use get_be64() to create an 8-byte integer from two 4-byte integers >

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 6:36 PM, SZEDER Gábor wrote: > This series, queued as 'nd/shared-index-fix', makes the 32 bit Linux > build job fail on Travis CI. Unfortunately, all it can tell us about > the failure is this: > > Test Summary Report > --- >

[PATCH 00/11] Some fixes and bunch of object_id conversions

This patch series puts some mundane groundwork for experimentation with a new hashing algorithm in git-hash-object. Some time has passed since my last patches, and I see, that work on new hashing algorithm progressed nicely since then: * brian m. carlson implemented vtable for hash algorithm

[PATCH 10/11] notes: convert write_notes_tree to object_id

Convert the definition and declaration of write_notes_tree to struct object_id and adjust usage of this function. Additionally, improve style of small part of this function, as old formatting made it hard to understand at glance what this part of code is doing. Signed-off-by: Patryk Obara

[PATCH 08/11] commit: convert commit_tree* to object_id

Convert the definitions and declarations of commit_tree and commit_tree_extended to use struct object_id and adjust all usages of these functions. Signed-off-by: Patryk Obara --- builtin/am.c | 4 ++-- builtin/commit-tree.c | 4 ++-- builtin/commit.c | 5

[PATCH 09/11] notes: convert combine_notes_* to object_id

Convert the definition and declarations of combine_notes_* functions to struct object_id and adjust usage of these functions. Signed-off-by: Patryk Obara --- notes.c | 46 +++--- notes.h | 25 +++-- 2 files

[PATCH 02/11] clang-format: adjust penalty for return type line break

The penalty of 5 makes clang-format very eager to put even short type declarations (e.g. "extern int") into a separate line, even when breaking parameters list is sufficient. Signed-off-by: Patryk Obara --- .clang-format | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH 05/11] sha1_file: convert hash_sha1_file to object_id

Convert the declaration and definition of hash_sha1_file to use struct object_id and adjust all function calls. Signed-off-by: Patryk Obara --- apply.c | 4 ++-- builtin/index-pack.c | 3 +-- builtin/replace.c| 2 +-

[PATCH 03/11] sha1_file: convert pretend_sha1_file to object_id

Convert the declaration and definition of pretend_sha1_file to use struct object_id and adjust all usages of this function. Signed-off-by: Patryk Obara --- blame.c | 2 +- cache.h | 3 ++- sha1_file.c | 8 3 files changed, 7 insertions(+), 6 deletions(-)

[PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --recreate-merges B`, in particular to the commit `D`. In the default mode, the new

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 07:47:50PM +0700, Duy Nguyen wrote: > I may need help getting that log (or even better the trash directory > of t1700). I tried -m32 build, then valgrind on amd64 (because it > didn't work with my 32 build), running the tests with dash and even > the linux32 docker version

[PATCH 11/11] sha1_file: convert write_sha1_file to object_id

Convert the definition and declaration of write_sha1_file to struct object_id and adjust usage of this function. This commit also converts static function write_sha1_file_prepare, as it is closely related. Replace sha1_to_hex, hashcpy and hashclr with their oid equivalents wherever possible.

[PATCH 01/11] http-push: improve error log

When git push fails due to server-side WebDAV error, it's not easy to point to the main culprit. Additional information about exact cURL error and HTTP server response is helpful for debugging purpose. New error log helped me pinpoint failing test t5540-http-push-webdav to a missing Apache

[PATCH 04/11] dir: convert struct sha1_stat to use object_id

Convert the declaration of struct sha1_stat. Adjust all usages of this struct and replace hash{clr,cmp,cpy} with oid{clr,cmp,cpy} wherever possible. Remove macro EMPTY_BLOB_SHA1_BIN, as it's no longer used. Signed-off-by: Patryk Obara --- cache.h

[PATCH 07/11] match-trees: convert splice_tree to object_id

Convert the definition of static recursive splice_tree function to use struct object_id and adjust single caller. Signed-off-by: Patryk Obara --- match-trees.c | 42 -- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git

[PATCH 06/11] cache: clear whole hash buffer with oidclr

As long as GIT_SHA1_RAWSZ is equal to GIT_MAX_RAWSZ there's no problem, but when new hashing algorithm will be in place this memset will clear only 20-byte prefix of hash buffer. Alternatively, hashclr implementation could be adjusted, but this function is almost removed from codebase already.

Re: [PATCH] files_initial_transaction_commit(): only unlock if locked

On Thu, Jan 18, 2018 at 02:38:41PM +0100, Mathias Rav wrote: > Running git clone --single-branch --mirror -b TAGNAME previously > triggered the following error message: > > fatal: multiple updates for ref 'refs/tags/TAGNAME' not allowed. > > This error condition is handled in

[PATCH 0/8] rebase -i: offer to recreate merge commits

Once upon a time, I dreamt of an interactive rebase that would not flatten branch structure, but instead recreate the commit topology faithfully. My original attempt was --preserve-merges, but that design was so limited that I did not even enable it in interactive mode. Subsequently, it *was*

Re: [PATCH v2 03/18] ref-filter: make valid_atom as function parameter

On Thu, Jan 18, 2018 at 12:49 PM, Оля Тележная wrote: > 2018-01-18 9:20 GMT+03:00 Оля Тележная : >> >> I think it's important to finish migrating process at first. I mean, >> now we are preparing and collecting everything in ref-filter, but we

Re: Bug Report: Subtrees and GPG Signed Commits

Hi, just following up on this bug report. I have not heard back. Is there additional information that's needed? Is there a better place to file bug reports? Thanks On Sat, Jan 6, 2018 at 5:45 PM, Stephen R Guglielmo wrote: > Hi all, > > I've noticed an issue regarding the

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > In the previous patches, we implemented the basic functionality of the > `git rebase -i --recreate-merges` command, in particular the `merge` > command to create merge commits in the sequencer. > > The

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > > As a convenience shortcut, also to improve readability of the

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > This patch is part of the effort to reimplement `--preserve-merges` with > a substantially improved design, a design that has been developed in the > Git for Windows project to maintain the dozens of

Re: [PATCH 00/11] Some fixes and bunch of object_id conversions

On Thu, 18 Jan 2018 15:50:52 +0100 Patryk Obara wrote: > Patch 1 is not directly related to object_id conversions but helped with > debugging t5540, which kept failing on master for me (spoiler: it was Fedora > fault). It helps with debugging of failing git-push over

Re: [PATCH 0/8] rebase -i: offer to recreate merge commits

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > Once upon a time, I dreamt of an interactive rebase that would not > flatten branch structure, but instead recreate the commit topology > faithfully. > > My original attempt was --preserve-merges, but that

Re: [PATCH] enable core.fsyncObjectFiles by default

[adding Chris to the Cc list - this is about the awful ext3 data=ordered behavior of syncing the whole file system data and metadata on each fsync] On Wed, Jan 17, 2018 at 03:57:53PM -0800, Linus Torvalds wrote: > On Wed, Jan 17, 2018 at 3:52 PM, Theodore Ts'o wrote: > > > > Well,

Re: [RFC PATCH 2/2] http: support omitting data from traces

On Wed, Jan 17, 2018 at 7:34 PM, Jonathan Tan wrote: > GIT_TRACE_CURL provides a way to debug what is being sent and received > over HTTP, with automatic redaction of sensitive information. But it > also logs data transmissions, which significantly increases the log file

Re: [RFC PATCH 1/2] http: support cookie redaction when tracing

On Wed, Jan 17, 2018 at 7:34 PM, Jonathan Tan wrote: > When using GIT_TRACE_CURL, Git already redacts the "Authorization:" and > "Proxy-Authorization:" HTTP headers. Extend this redaction to a > user-specified list of cookies, specified through the > "GIT_REDACT_COOKIES"

[Question] format-patch along a specific path

Hi all, What I’m trying to do is to format a patch based on a single commit from 2.16.0 representing the NonStop port, for review and comments to the team. Here is a partial (somewhat familiar) tree: *   f1a482cd8 (HEAD -> randall_2.16, ituglib_release) NonStop port changes for git 2.16.0. |\ |

[PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

Up to now each command took a commit as its first argument and ignored the rest of the line (usually the subject of the commit) Now that we have commands that take different arguments, clarify each command by giving the argument list. Signed-off-by: Stefan Beller ---

[PATCH 9, 10/8] interactive rebase feedback

I thought of writing a reply, but instead I wrote it in patch form. Stefan Beller (2): [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command git-rebase--interactive.sh | 23

[PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

Jake suggested using "x false" instead of "edit" for some corner cases. I do prefer using "x false" for all kinds of things such as stopping before a commit (edit only let's you stop after a commit), and the knowledge that "x false" does the least amount of actions behind my back. We should have

Re: [PATCH v2] diff: add --compact-summary option to complement --stat

On Thu, Jan 18, 2018 at 5:05 AM, Nguyễn Thái Ngọc Duy wrote: > [...] > The new option --compact-summary implements this with a tweak to support > mode change, which is shown in --summary too. > > For mode changes, executable bit is denoted as "M+x" or "M-x" when it's > added or

Re: Git For Aix 6 and 7

On 2018-01-18 09:47 AM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jan 18 2018, raikrishna jotted: > >> Hi Team, >> >> I have an urgent requirement to install Git client for Aix 6 and 7, could >> you please help send me or navigate me to the correct url. >> My present infrastructure comprise of

git 2.16.0 segfaults on clone of specific repo

I found that git 2.16.0 segfaults on clone of vim-colorschemes repo. See the log below. alexbool@alexbool-osx ~/Documents> lldb -- git clone https://github.com/flazz/vim-colorschemes.git (lldb) target create "git" Current executable set to 'git' (x86_64). (lldb) settings set -- target.run-args

RE: git 2.16.0 segfaults on clone of specific repo

On January 18, 2018 3:56 PM, Aleks wrote: > I found that git 2.16.0 segfaults on clone of vim-colorschemes repo. Just tested on NonStop NSE and works fine here. Just an FYI now that we're on 2.16.0. Cheers, Randall -- Brief whoami: NonStop developer since approximately

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

Hi Jake, On Thu, 18 Jan 2018, Jacob Keller wrote: > On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin > wrote: > > This commit implements the commands to label, and to reset to, given > > revisions. The syntax is: > > > > label > > reset > > > >

Re: [RFC PATCH] NonStop port changes for git 2.16.0.

On Thu, Jan 18, 2018 at 2:42 PM, wrote: > From: "Randall S. Becker" > > Explanation: I'm looking for comments on how best to handle the changes > below that are needed for the NonStop port. Ideally you'd send them as single patches, each of

Re: [PATCH] describe: use strbuf_add_unique_abbrev() for adding short hashes

> On 18 Jan 2018, at 23:40, SZEDER Gábor wrote: > > On Thu, Jan 18, 2018 at 10:40 PM, René Scharfe wrote: >> Am 16.01.2018 um 18:11 schrieb SZEDER Gábor: >>> Unfortunately, most of the changes coming from 'strbuf.cocci' don't >>> make any sense, they appear

Re: Git For Aix 6 and 7

On Thu, Jan 18 2018, raikrishna jotted: > Hi Team, > > I have an urgent requirement to install Git client for Aix 6 and 7, could > you please help send me or navigate me to the correct url. > My present infrastructure comprise of Aix and Linux servers , I am > successfully using Git on Linux

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Hi Jake, On Thu, 18 Jan 2018, Jacob Keller wrote: > On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin > wrote: > > This patch is part of the effort to reimplement `--preserve-merges` with > > a substantially improved design, a design that has been developed in the

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 1:13 PM, Johannes Schindelin wrote: > Hi Jake, > > On Thu, 18 Jan 2018, Jacob Keller wrote: > >> On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin >> wrote: >> > This commit implements the commands to label, and

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

>> Same for the test here, I can't figure out why this is necessary in >> this patch as opposed to the patch which first introduced the >> refs/rewritten/ refs. > > Woops. This was its own commit, and must have been accidentally squashed > during one of my rebases. Will re-introduce it; Yep that

Re: [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

Hi Stefan, On Thu, 18 Jan 2018, Stefan Beller wrote: > Up to now each command took a commit as its first argument and ignored > the rest of the line (usually the subject of the commit) > > Now that we have commands that take different arguments, clarify each > command by giving the argument

Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

From: "Johannes Schindelin" This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --recreate-merges B`, in

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

Hi Stefan, On Thu, 18 Jan 2018, Stefan Beller wrote: > Jake suggested using "x false" instead of "edit" for some corner cases. > > I do prefer using "x false" for all kinds of things such as stopping > before a commit (edit only let's you stop after a commit), and the > knowledge that "x false"

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

On Thu, Jan 18, 2018 at 2:00 PM, Johannes Schindelin wrote: >> + TODO_STOP, > > I see that your original idea was "stop", but then you probably realized > that there would be no good abbreviation for that, and changed your mind. > > Personally, I would have called

[ANNOUNCE] Git for Windows 2.16.0(2)

Dear Git users, It is my pleasure to announce that Git for Windows 2.16.0(2) is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.15.1(2) (November 30th 2017) Git for Windows now has a new homepage: https://gitforwindows.org/ (it is still graciously

Re: [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: > Up to now each command took a commit as its first argument and ignored > the rest of the line (usually the subject of the commit) > > Now that we have commands that take different arguments, clarify each > command by

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

Hi Jake, On Thu, 18 Jan 2018, Jacob Keller wrote: > On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin > wrote: > > In the previous patches, we implemented the basic functionality of the > > `git rebase -i --recreate-merges` command, in particular the `merge` > >

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

From: "Johannes Schindelin" The sequencer just learned a new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of

Re: [PATCH] describe: use strbuf_add_unique_abbrev() for adding short hashes

Am 16.01.2018 um 18:11 schrieb SZEDER Gábor: > Unfortunately, most of the changes coming from 'strbuf.cocci' don't > make any sense, they appear to be the mis-application of the "use > strbuf_addstr() instead of strbuf_addf() to add a single string" rule: > >- strbuf_addf(_repo,

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

On Thu, 18 Jan 2018 09:56:50 +0100 Christian Couder wrote: > I am still not very happy with fetch_object() not returning anything. > I wonder what happens when that function is used to fetch from a repo > that cannot provide the requested object. My idea was to save

RE: [Question] format-patch along a specific path

On January 18, 2018 2:17 PM, I wrote: > What I’m trying to do is to format a patch based on a single commit from > 2.16.0 representing the NonStop port, for review and comments to the team. > Here is a partial (somewhat familiar) tree: > > *   f1a482cd8 (HEAD -> randall_2.16, ituglib_release)

[RFC PATCH] NonStop port changes for git 2.16.0.

From: "Randall S. Becker" Explanation: I'm looking for comments on how best to handle the changes below that are needed for the NonStop port. The hashmap.h and transport-helper.c will not be included in the final patch as they have already been communicated but did not

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: > Jake suggested using "x false" instead of "edit" for some corner cases. > > I do prefer using "x false" for all kinds of things such as stopping > before a commit (edit only let's you stop after a commit), and the >

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

From: "Jacob Keller" On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: This commit implements the commands to label, and to reset to, given revisions. The syntax is: label reset As a convenience shortcut, also

Re: [PATCH v2] diff: add --compact-summary option to complement --stat

On Thu, Jan 18 2018, Nguyễn Thái Ngọc Duy jotted: > This is partly inspired by gerrit web interface which shows diffstat > like this, e.g. with commit 0433d533f1 (notice the "A" column on the > third line): > > > Documentation/merge-config.txt | 4 + > builtin/merge.c

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 1:24 PM, Philip Oakley wrote: > From: "Jacob Keller" > >> On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin >> wrote: >>> >>> This commit implements the commands to label, and to reset to, given

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 1:22 PM, Johannes Schindelin wrote: >> Would it be possible to open the editor with the supplied text when >> there's no commit? The text after must be oneline only.. > > I actually want to avoid that because my main use case is

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 10:00:14PM +0700, Duy Nguyen wrote: > The test suite was run as root, no wonder why my removing write access > has no effect. I got the test to pass with this, but then it fails > with > > Can't write .prove (Permission denied) at > /usr/share/perl/5.22/App/Prove.pm

Re: [PATCH v3 0/3] fixes for split index mode

Friendly ping on this series now that 2.16 is out :) Is there anything in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in a nicer way) that still needs updating? It fixes a few bugs in split index mode with submodules/worktrees, so it would be nice to get this reviewed/merged.

Re: [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

On Thu, Jan 18, 2018 at 1:36 PM, Johannes Schindelin wrote: > Good idea! I would rather do it as an introductory patch (that only > converts the existing list). That makes sense. > > As to `merge`: it is a bit more complicated ;-) > > m, merge ( | "..." )

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

From: "Jacob Keller" On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: Jake suggested using "x false" instead of "edit" for some corner cases. I do prefer using "x false" for all kinds of things such as stopping before a commit (edit only

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

On Thu, Jan 18, 2018 at 2:08 PM, Philip Oakley wrote: > From: "Jacob Keller" >> >> On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller >> wrote: >>> >>> Jake suggested using "x false" instead of "edit" for some corner cases. >>> >>>

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 10:37 PM, Jeff King wrote: > On Thu, Jan 18, 2018 at 10:00:14PM +0700, Duy Nguyen wrote: > >> The test suite was run as root, no wonder why my removing write access >> has no effect. I got the test to pass with this, but then it fails >> with >> >> Can't

Re: [PATCH] describe: use strbuf_add_unique_abbrev() for adding short hashes

On Thu, Jan 18, 2018 at 10:40 PM, René Scharfe wrote: > Am 16.01.2018 um 18:11 schrieb SZEDER Gábor: >> Unfortunately, most of the changes coming from 'strbuf.cocci' don't >> make any sense, they appear to be the mis-application of the "use >> strbuf_addstr() instead of

Re: git 2.16.0 segfaults on clone of specific repo

On Fri, Jan 19, 2018 at 12:31:58PM +0700, Duy Nguyen wrote: > On Fri, Jan 19, 2018 at 10:40 AM, brian m. carlson > > I'm still extremely puzzled as to why this doesn't fail on Linux. If > > it's failing in this case, it should very, very clearly fail all the > > time we access an empty blob or an

Re: [PATCH] repository: pre-initialize hash algo pointer

On Thu, Jan 18, 2018 at 11:18 PM, brian m. carlson wrote: > There are various git subcommands (among them, clone) which don't set up > the repository (that is, they lack RUN_SETUP or RUN_SETUP_GENTLY) but > end up needing to have information about the hash algorithm

Re: [PATCH v2 01/18] cat-file: split expand_atom into 2 functions

On Thu, Jan 18, 2018 at 7:22 AM, Оля Тележная wrote: > 2018-01-18 2:04 GMT+03:00 Christian Couder : >> On Wed, Jan 17, 2018 at 10:49 PM, Jeff King wrote: >>> On Tue, Jan 16, 2018 at 10:22:23AM +0300, Оля Тележная wrote: >>>

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

On Wed, Jan 10, 2018 at 11:03 PM, Jeff Hostetler wrote: > > > On 1/10/2018 2:57 PM, Junio C Hamano wrote: >> >> Jeff Hostetler writes: >> >>> On 1/9/2018 6:33 PM, Junio C Hamano wrote: --

[PATCH v6 0/7] Trace env variables in run_command()

v6 squashes Junio's changes in 6/7 and moves trace_run_command() from trace.c to run-command.c. Jeff King (2): sq_quote_argv: drop maxlen parameter trace: avoid unnecessary quoting Nguyễn Thái Ngọc Duy (5): trace.c: move strbuf_release() out of print_trace_line() run-command.c: introduce

[PATCH] dir.c: print correct errno when opendir() fails

The call invalidate_directory() between opendir() and warning_errno() in theory could make some system calls and change errno. Prevent that by warning immediately after opendir(). Signed-off-by: Nguyễn Thái Ngọc Duy --- This is on top of nd/fix-untracked-cache-invalidation

[PATCH v6 5/7] run-command.c: print program 'git' when tracing git_cmd mode

We normally print full command line, including the program and its argument. When git_cmd is set, we have a special code path to run the right "git" program and child_process.argv[0] will not contain the program name anymore. As a result, we print just the command arguments. I thought it was a

[PATCH v6 7/7] run-command.c: print new cwd in trace_run_command()

If a command sets a new env variable GIT_DIR=.git, we need more context to know where that '.git' is related to. Signed-off-by: Nguyễn Thái Ngọc Duy --- run-command.c | 5 + 1 file changed, 5 insertions(+) diff --git a/run-command.c b/run-command.c index

[PATCH v6 6/7] run-command.c: print env vars in trace_run_command()

Occasionally submodule code could execute new commands with GIT_DIR set to some submodule. GIT_TRACE prints just the command line which makes it hard to tell that it's not really executed on this repository. Print the env delta (compared to parent environment) in this case. Helped-by: Junio C

[PATCH v6 4/7] run-command.c: introduce trace_run_command()

This is the same as the old code that uses trace_argv_printf() in run-command.c. This function will be improved in later patches to print more information from struct child_process. Signed-off-by: Nguyễn Thái Ngọc Duy --- run-command.c | 18 +- 1 file changed,

[PATCH v6 2/7] trace: avoid unnecessary quoting

From: Jeff King Trace output which contains arbitrary strings (e.g., the arguments to commands which we are running) is always passed through sq_quote_buf(). That function always adds single-quotes, even if the output consists of vanilla characters. This can make the output a bit

[PATCH v6 1/7] sq_quote_argv: drop maxlen parameter

From: Jeff King No caller passes anything but "0" for this parameter, which requests that the function ignore it completely. In fact, in all of history there was only one such caller, and it went away in 7f51f8bc2b (alias: use run_command api to execute aliases, 2011-01-07).

[PATCH v6 3/7] trace.c: move strbuf_release() out of print_trace_line()

The function is about printing a trace line, not releasing the buffer it receives too. Move strbuf_release() back outside. This makes it easier to see how strbuf is managed. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- trace.c | 5

[PATCH v2] diff: add --compact-summary option to complement --stat

This is partly inspired by gerrit web interface which shows diffstat like this, e.g. with commit 0433d533f1 (notice the "A" column on the third line): Documentation/merge-config.txt | 4 + builtin/merge.c| 2 + A t/t5573-pull-verify-signatures.sh | 81

[PATCH] repository: pre-initialize hash algo pointer

There are various git subcommands (among them, clone) which don't set up the repository (that is, they lack RUN_SETUP or RUN_SETUP_GENTLY) but end up needing to have information about the hash algorithm in use. Because the hash algorithm is part of struct repository and it's only initialized in

It's all about 14

Hello , facebook is given out 14,000,000.USD (Fourteen Million Dollars) its all about 14 Please, respond with your Unique Code (FB/BF14-13M5250UD) using your registration email, to the Verification Department at; dustinmoskovitz.faceb...@gmail.com Dustin Moskovitz Facebook Team Copyright

Re: git 2.16.0 segfaults on clone of specific repo

On Fri, Jan 19, 2018 at 10:40 AM, brian m. carlson wrote: > On Thu, Jan 18, 2018 at 10:06:10PM -0500, Eric Sunshine wrote: >> > I have a guess about what the problem might be. Can you try this patch >> > and see if it fixes things? >> >> That does fix the crash.

Re: git 2.16.0 segfaults on clone of specific repo

On Thu, Jan 18, 2018 at 07:15:56PM -0500, Eric Sunshine wrote: > [+cc:brian] > > On Thu, Jan 18, 2018 at 3:55 PM, Александр Булаев > wrote: > > I found that git 2.16.0 segfaults on clone of vim-colorschemes repo. > > > > (lldb) run > > Process 25643 launched:

Re: git 2.16.0 segfaults on clone of specific repo

On Thu, Jan 18, 2018 at 9:47 PM, brian m. carlson wrote: > On Thu, Jan 18, 2018 at 07:15:56PM -0500, Eric Sunshine wrote: >> On Thu, Jan 18, 2018 at 3:55 PM, Александр Булаев >> wrote: >> > I found that git 2.16.0 segfaults on clone of

RE: git 2.16.0 segfaults on clone of specific repo

On January 18, 2018 10:06 PM, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 9:47 PM, brian m. carlson > wrote: > > On Thu, Jan 18, 2018 at 07:15:56PM -0500, Eric Sunshine wrote: > >> On Thu, Jan 18, 2018 at 3:55 PM, Александр Булаев > >>

Re: git 2.16.0 segfaults on clone of specific repo

On Thu, Jan 18, 2018 at 10:06:10PM -0500, Eric Sunshine wrote: > > I have a guess about what the problem might be. Can you try this patch > > and see if it fixes things? > > That does fix the crash. Thanks for the quick diagnosis. > > Can the commit message go into more detail as to why this

Re: [PATCH v2] diff: add --compact-summary option to complement --stat

On Thu, Jan 18, 2018 at 05:05:46PM +0700, Nguyễn Thái Ngọc Duy wrote: > This is partly inspired by gerrit web interface which shows diffstat > like this, e.g. with commit 0433d533f1 (notice the "A" column on the > third line): > > Documentation/merge-config.txt | 4 + >

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

This series, queued as 'nd/shared-index-fix', makes the 32 bit Linux build job fail on Travis CI. Unfortunately, all it can tell us about the failure is this: Test Summary Report --- t1700-split-index.sh (Wstat: 256 Tests: 23 Failed: 1)

Assalamu`Alaikum.

Dear Sir/Madam. Assalamu`Alaikum. I am Dr mohammad ouattara, I have ($14.6 Million us dollars) to transfer into your account, I will send you more details about this deal and the procedures to follow when I receive a positive response from you, Have a great day, Dr mohammad ouattara.

  1   2   >