Re: Location limits on development, staging and production environments

On Mon, Jan 29, 2018 at 11:08 AM, H wrote: > I am a newcomer to git looking to set up a web development environment where > individual computers are used for development, the development.git, > staging.git and production.git repositories are stored on an external server

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

Hi Eric, On Fri, 19 Jan 2018, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin > wrote: > > > structure (similar in spirit to --preserve-merges, but with a > > substantially less-broken design). > > [...] > > Signed-off-by: Johannes

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

Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > + /* > > +* If HEAD is not identical to the parent of the original merge commit, > > +* we cannot fast-forward. > > +*/ > > + can_fast_forward = commit &&

[PATCH 30/37] init-db: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/init-db.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git

[PATCH 26/37] split-index: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- split-index.c | 10 +- split-index.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/split-index.c

[PATCH 24/37] ref-filter: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- ref-filter.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index

[PATCH 08/37] apply: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- apply.c | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/apply.c

[PATCH 09/37] checkout: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/checkout.c | 138 ++--- 1 file changed, 69 insertions(+), 69 deletions(-)

[PATCH 04/37] pack-objects: rename 'this' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/pack-objects.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/pack-objects.c

[PATCH 31/37] environment: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- cache.h | 2 +- environment.c | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cache.h

[PATCH 23/37] read-cache: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- read-cache.c | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/read-cache.c

[PATCH 22/37] line-log: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- line-log.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git

[PATCH 06/37] diff: rename 'this' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 0a9a0cdf1..d682d0d1f 100644

[PATCH 32/37] diff: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index d49732b3b..142a633e1

[PATCH 35/37] tempfile: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- tempfile.c | 12 ++-- tempfile.h | 34 +- 2 files changed, 23 insertions(+), 23 deletions(-)

[PATCH 25/37] remote: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- remote.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/remote.c b/remote.c index

[PATCH 05/37] rev-parse: rename 'this' variable

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/rev-parse.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git

[PATCH 18/37] diffcore-delta: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diffcore-delta.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/diffcore-delta.c

[PATCH 03/37] blame: rename 'this' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- blame.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/blame.c b/blame.c

[PATCH 07/37] apply: rename 'try' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- apply.c | 68 - 1 file changed, 34 insertions(+), 34 deletions(-)

[PATCH 01/37] object_info: change member name from 'typename' to 'type_name'

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/cat-file.c | 2 +- cache.h| 2 +- packfile.c | 6 +++--- sha1_file.c| 10 +- 4 files

[PATCH 21/37] imap-send: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- imap-send.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/imap-send.c b/imap-send.c index

[PATCH 28/37] trailer: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- trailer.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/trailer.c

[PATCH 34/37] wrapper: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- git-compat-util.h | 4 ++-- wrapper.c | 40 2 files changed, 22 insertions(+), 22

[PATCH 36/37] trailer: rename 'template' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- trailer.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trailer.c b/trailer.c index

[PATCH 33/37] environment: rename 'namespace' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- environment.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index

[PATCH 27/37] submodule: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- submodule.c | 14 +++--- submodule.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/submodule.c

[PATCH 37/37] replace: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/replace.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c

[PATCH 29/37] unpack-trees: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- unpack-trees.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index

[PATCH 20/37] http: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- http.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/http.c b/http.c index 597771271..41cfa41a9

Re: Some rough edges of core.fsmonitor

On 1/29/2018 4:40 AM, Duy Nguyen wrote: On Sat, Jan 27, 2018 at 12:43:41PM +0100, Ævar Arnfjörð Bjarmason wrote: b) with fsmonitor $ time GIT_TRACE_PERFORMANCE=1 ~/g/git/git-status 12:34:23.833625 read-cache.c:1890 performance: 0.049485685 s: read cache .git/index This is

[PATCH] git-svn: control destruction order to avoid segfault

Todd Zullinger wrote: > I'm running the tests with and without your patch as well. > So far I've run t9128 300 times with the patch and no > failures. Without it, it's failed 3 times in only a few > dozen runs. That's promising. Thanks for confirming it works on other systems.

Re: [PATCH v3 3/3] sequencer: run 'prepare-commit-msg' hook

Hi Phillip, On Wed, 24 Jan 2018, Phillip Wood wrote: > diff --git a/sequencer.h b/sequencer.h > index > 24401b07d57b7ca875dea939f465f3e6cf1162a5..e45b178dfc41d723bf186f20674c4515d7c7fa00 > 100644 > --- a/sequencer.h > +++ b/sequencer.h > @@ -1,6 +1,7 @@ > #ifndef SEQUENCER_H > #define

Re: [PATCHv2 0/5] Travis CI: don't run the test suite as root in the 32 bit Linux build

On Mon, Jan 29, 2018 at 06:17:08PM +0100, SZEDER Gábor wrote: > This version addresses Peff comments: > > - Updated the commit message to discuss the broken && chain and its > consequences in patch 2. > - Fixed quoting of the 'su' command snippet and updated the commit > message in

Location limits on development, staging and production environments

I am a newcomer to git looking to set up a web development environment where individual computers are used for development, the development.git, staging.git and production.git repositories are stored on an external server reachable by password-less ssh and the staging and production websites

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

Hi Philip, On Thu, 18 Jan 2018, 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 > > > revisions. The

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

Hi Jake & Phillip, On Sat, 20 Jan 2018, Jacob Keller wrote: > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood > wrote: > > On 18/01/18 15:35, Johannes Schindelin wrote: > >> > >> This patch is part of the effort to reimplement `--preserve-merges` with > >> a

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

Hi Junio, On Fri, 19 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Think of --recreate-merges as "--preserve-merges done right". It > > introduces new verbs for the todo list, `label`, `reset` and `merge`. > > For a commit topology like this: >

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

Hi Junio, On Mon, 22 Jan 2018, Junio C Hamano wrote: > Jacob Keller writes: > > > The code looks good, but I'm a little wary of adding bud which > > hard-codes a specific label. I suppose it does grant a bit of > > readability to the resulting script... ? It doesn't

[PATCH 11/37] pack-redundant: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/pack-redundant.c | 48 1 file changed, 24 insertions(+), 24 deletions(-)

[PATCH 13/37] remote: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/remote.c | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git

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

Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > structure (similar in spirit to --preserve-merges, but with a > > substantially less-broken design). > > ... > > @@ -2785,6 +2787,335 @@ void append_signoff(struct strbuf

[PATCH 12/37] reflog: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/reflog.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c

[PATCH 10/37] help: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/help.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index

[PATCH 16/37] diff-lib: rename 'new' variable

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff-lib.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index

[PATCH 15/37] commit: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- commit.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/commit.c b/commit.c index

[PATCH v2 04/10] 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 v2 00/10] 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*

[PATCH v2 03/10] 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` and

[PATCH v2 05/10] rebase-helper --make-script: introduce a flag to recreate merges

The sequencer just learned 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 v2 02/10] 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 v2 01/10] git-rebase--interactive: clarify arguments

From: Stefan Beller 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 are about to introduce commands that take different arguments, clarify each command by giving the argument

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

Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > My original attempt was --preserve-merges, but that design was so > > limited that I did not even enable it in interactive mode. > > ... > > There are more patches in the

[PATCH v2 08/10] 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,

Hello Dear,

Did you receive and understand the previous email i sent you? Please let me Know.

Re: [PATCH 1/8] sequencer: introduce new commands to resettherevision

Hi Jake, On Fri, 19 Jan 2018, Jacob Keller wrote: > On Fri, Jan 19, 2018 at 10:55 AM, Phillip Wood > wrote: > > On 19/01/18 12:24, Phillip Wood wrote: > >> > >> On 18/01/18 15:35, Johannes Schindelin wrote: > >>> > >>> Internally, the `label ` command creates the ref

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

Hi Phillip, On Fri, 19 Jan 2018, Phillip Wood wrote: > On 18/01/18 15:35, Johannes Schindelin wrote: > > > > 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

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

Hi Eric, On Fri, 19 Jan 2018, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin > wrote: > > [...] > > With this patch, the goodness of the Git garden shears comes to `git > > rebase -i` itself. Passing the `--recreate-merges` option will

Re: [PATCH 1/8] sequencer: introduce new commands to resettherevision

Hi Phillip, On Fri, 19 Jan 2018, Phillip Wood wrote: > > On 18/01/18 15:35, Johannes Schindelin wrote: > > > This idea was developed in Git for Windows' Git garden shears (that > > are used to maintain the "thicket of branches" on top of upstream > > Git), and this patch is part of the effort

Re: [PATCH 1/8] sequencer: introduce new commands to resettherevision

Hi, On Mon, 29 Jan 2018, Johannes Schindelin wrote: > On Fri, 19 Jan 2018, Jacob Keller wrote: > > > On Fri, Jan 19, 2018 at 10:55 AM, Phillip Wood > > wrote: > > > On 19/01/18 12:24, Phillip Wood wrote: > > >> > > >> On 18/01/18 15:35, Johannes Schindelin wrote: > >

[PATCH v2 10/10] 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`. So far, the new branch

Re: Shawn Pearce has died

On Mon, Jan 29, 2018 at 6:21 PM, Jeff King wrote: > On Mon, Jan 29, 2018 at 10:33:08AM +0100, Johannes Schindelin wrote: > >> I found these sad news in my timeline today: >> >> https://twitter.com/cdibona/status/957822400518696960 > > Thanks for posting this. Yeah, thanks. > I

[PATCH v2 06/10] 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 v2 09/10] pull: accept --rebase=recreate to recreate the branch topology

Similar to the `preserve` mode simply passing the `--preserve-merges` option to the `rebase` command, the `recreate` mode simply passes the `--recreate-merges` option. This will allow users to conveniently rebase non-trivial commit topologies when pulling new commits, without flattening them.

[PATCH v2 07/10] sequencer: make refs generated by the `label` command worktree-local

This allows for rebases to be run in parallel in separate worktrees (think: interrupted in the middle of one rebase, being asked to perform a different rebase, adding a separate worktree just for that job). Signed-off-by: Johannes Schindelin --- refs.c

Bug/comment

Though it might not be considered a bug 'per se' it is definitely wired. Namely, when you type 'yes' word and hit enter in git bash for widnows, the process enters infinite loop and just prints 'y' letter in new line. It can be interrupted with CTRL+C. I'm not sure if it has any other

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

Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Eric Sunshine writes: > > >> + is_octopus = to_merge && to_merge->next; > >> + > >> + if (is_octopus) > >> + BUG("Octopus merges not yet supported"); > > > > Is

How juggle branches?

First, I develop program which uses mysql in branch master. Next i change name this branch to before_hbase, and began develop HBase in branch master. I also develop before_hbase. Now, instead HBase will be MapR-DB which will before_hbase , not master succesor. How do: - change before_hbase to

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

Hi Junio, On Mon, 22 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > end_of_object_name = (char *) bol + strcspn(bol, " \t\n"); > > + item->arg = end_of_object_name + strspn(end_of_object_name, " \t"); > > + item->arg_len = (int)(eol -

Donation of £1,500,000.00 GBP!!

My wife and I have awarded you with a donation of £1,500,000.00 GBP from part of our Jackpot Lottery of £161,653,000 Million Pounds, send your name,address, phone for claims. We await your earliest response and God Bless you. Best of luck. Chris Colin & Weir

[PATCH 02/37] object: rename function 'typename' to 'type_name'

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/cat-file.c | 2 +- builtin/diff-tree.c| 2 +- builtin/fast-export.c

[PATCH 19/37] entry: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- entry.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/entry.c

[PATCH 00/37] removal of some c++ keywords

A while back there was some discussion of getting our codebase into a state where we could use a c++ compiler if we wanted to (for various reason like leveraging c++ only analysis tools, etc.). Johannes Sixt had a very large patch that achieved this but it wasn't in a state where it could be

[PATCH 14/37] combine-diff: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- combine-diff.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index

[PATCH 17/37] diff: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index

Re: "git fast-import" crashes parsing output from "fossil export --git"

On 29 January 2018 at 19:11, SZEDER Gábor wrote: > > ..[snip].. > > Just commit some weird filenames, even one with a newline in it, to > > test the code. > > from :26779 > > M 100644 :427 :abc > > M 100644 :10049 abc > > def.txt > > A path like this must be quoted. Quoting

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

Hi Philip, On Thu, 18 Jan 2018, Philip Oakley wrote: > 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

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

Hi Eric, On Fri, 19 Jan 2018, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin > wrote: > > [...] > > +static int do_reset(const char *name, int len) > > +{ > > + [...] > > + if (hold_locked_index(, LOCK_REPORT_ON_ERROR) < 0) >

[PATCH v5 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

From: Lars Schneider Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we allocate the buffer for the lower case string with xmallocz(). This already ensures a NUL at the end of the allocated buffer. Remove the unnecessary assignment. Signed-off-by:

[PATCH v5 5/7] convert: add 'working-tree-encoding' attribute

From: Lars Schneider Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git

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

Hi Junio, On Wed, 24 Jan 2018, Junio C Hamano wrote: > Eric Sunshine writes: > > >> +static int do_reset(const char *name, int len) > >> +{ > >> + [...] > >> + if (hold_locked_index(, LOCK_REPORT_ON_ERROR) < 0) > >> + return -1; > >> + > >> +

Re: t9128 failing randomly with svn 1.9?

Eric Wong wrote: > Todd Zullinger wrote: > Just a guess, but it might be related to destruction order. > Running t9128 on a 32-bit Pentium-M, it took me 39 tries to > fail. > > diff --git a/git-svn.perl b/git-svn.perl > index 76a75d0b3d..2ba14269bb 100755 > --- a/git-svn.perl >

Re: Shawn Pearce has died

On 01/29, Jeff King wrote: > On Mon, Jan 29, 2018 at 10:33:08AM +0100, Johannes Schindelin wrote: > > > I found these sad news in my timeline today: > > > > https://twitter.com/cdibona/status/957822400518696960 > > Thanks for posting this. > > I know Shawn has not been all that active on this

Re: Shawn Pearce has died

I guess your email server doesn't like HTML messages... here's the plain text: Chris, also on this email thread, is working on putting together some kind of video of Shawn's colleagues at Google talking about working with him. Part of the thought is that his boys are going to want to know what

[PATCH v1 4/5] submodule foreach: document variable '$displaypath'

It was observed that the variable '$displaypath' was accessible but undocumented. Hence, document it. Discussed-with: Ramsay Jones Signed-off-by: Stefan Beller Signed-off-by: Prathamesh Chavan ---

[PATCH v1 5/5] submodule: port submodule subcommand 'foreach' from shell to C

This aims to make git-submodule foreach a builtin. This is the very first step taken in this direction. Hence, 'foreach' is ported to submodule--helper, and submodule--helper is called from git-submodule.sh. The code is split up to have one function to obtain all the list of submodules. This

[PATCH v1 0/5] Incremental rewrite of git-submodules: git-foreach

Following series of patches focuses on porting submodule subcommand git-foreach from shell to C. An initial attempt for porting was introduced about 9 months back, and since then then patches have undergone many changes. Some of the notable discussion thread which I would like to point out is:

[PATCH v1 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

When running 'git submodule foreach' from a subdirectory of your repository, nested submodules get a bogus value for $sm_path: For a submodule 'sub' that contains a nested submodule 'nested', running 'git -C dir submodule foreach echo $path' would report path='../nested' for the nested submodule.

[PATCH v1 2/5] submodule foreach: document '$sm_path' instead of '$path'

As using a variable '$path' may be harmful to users due to capitalization issues, see 64394e3ae9 (git-submodule.sh: Don't use $path variable in eval_gettext string, 2012-04-17). Adjust the documentation to advocate for using $sm_path, which contains the same value. We still make the 'path'

[PATCH v1 3/5] submodule foreach: clarify the '$toplevel' variable documentation

It does not contain the topmost superproject as the author assumed, but the direct superproject, such that $toplevel/$sm_path is the actual absolute path of the submodule. Discussed-with: Ramsay Jones Signed-off-by: Stefan Beller Signed-off-by:

[PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

From: Torsten Bögershausen UTF-16 encoded files are treated as "binary" by Git, and no CRLF conversion is done. When the UTF-16 encoded files are converted into UF-8 using the new "working-tree-encoding", the CRLF are converted if core.autocrlf is true. This may lead to

[PATCH v5 6/7] convert: add tracing for 'working-tree-encoding' attribute

From: Lars Schneider Add the GIT_TRACE_CHECKOUT_ENCODING environment variable to enable tracing for content that is reencoded with the 'working-tree-encoding' attribute. This is useful to debug encoding issues. Signed-off-by: Lars Schneider

[PATCH v5 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

From: Lars Schneider Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE or UTF-32LE a BOM must not be used [1]. The function returns true if this is the case. This function is used in a subsequent commit. [1]

[PATCH v5 4/7] utf8: add function to detect a missing UTF-16/32 BOM

From: Lars Schneider If the endianness is not defined in the encoding name, then let's be strict and require a BOM to avoid any encoding confusion. The has_missing_utf_bom() function returns true if a required BOM is missing. The Unicode standard instructs to assume

[PATCH v5 0/7] convert: add support for different encodings

From: Torsten Bögershausen Take V4 from Lars, manually integrated the V2 squash patch, so a review would be good. Add my "comments" as a patch, see 7/7 (and this is more like an RFC) This needs to go on top of tb/crlf-conv-flags Lars Schneider (6): strbuf: remove unnecessary

[PATCH v5 2/7] strbuf: add xstrdup_toupper()

From: Lars Schneider Create a copy of an existing string and make all characters upper case. Similar xstrdup_tolower(). This function is used in a subsequent commit. Signed-off-by: Lars Schneider Signed-off-by: Torsten Bögershausen

Re: [PATCH 00/37] removal of some c++ keywords

On Tue, Jan 30, 2018 at 5:36 AM, Brandon Williams wrote: > A while back there was some discussion of getting our codebase into a state > where we could use a c++ compiler if we wanted to (for various reason like > leveraging c++ only analysis tools, etc.). Johannes Sixt had a

Re: Some rough edges of core.fsmonitor

On Sat, Jan 27, 2018 at 12:43:41PM +0100, Ævar Arnfjörð Bjarmason wrote: > b) with fsmonitor > > $ time GIT_TRACE_PERFORMANCE=1 ~/g/git/git-status > 12:34:23.833625 read-cache.c:1890 performance: 0.049485685 s: read > cache .git/index This is sort of off topic but may be

Re: Shawn Pearce has died

On Mon, Jan 29, 2018 at 4:33 PM, Johannes Schindelin wrote: > Hey fellow gitters, > > I found these sad news in my timeline today: > > https://twitter.com/cdibona/status/957822400518696960 > At first I didn't believe the subject line I just read. So sorry to hear

Shawn Pearce has died

Hey fellow gitters, I found these sad news in my timeline today: https://twitter.com/cdibona/status/957822400518696960 Ciao, Johannes

  1   2   >