Hi all,
my starting point is a Mercurial repository containing several
sub-repositories. The parent repo itself has very little content itself
but mostly acts as "orchestrator" of the sub-repos, i.e., it contains
build files for building the project as a whole, and it has branches
which are refle
Escaping two *'s as "\*\*" apparently makes Asciidoctor render the
second backslash literally, so we end up with "*\*". So let's not escape
that second asterisk. The result is now "**" as intended, both in
AsciiDoc and Asciidoctor.
Signed-off-by: Martin Ågren
---
Documentation/git-svn.txt | 10 +
This patch is a no-op for Asciidoctor, but makes AsciiDoc render this as
intended.
Signed-off-by: Martin Ågren
---
Documentation/git.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 00156d64aa..6d1f2fd9ae 100644
--- a/Documentation/git.tx
Signed-off-by: Martin Ågren
---
Documentation/config/diff.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index e48bb987d7..7a1bae116a 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.t
These tabs happen to appear in columns where they don't stand out too
much, so the diff here is non-obvious. Some of these are rendered
differently by AsciiDoc and Asciidoctor (although the difference might
be invisible!), which is how I found a few of them. The remainder were
found using `git grep
This dash at the start of the line causes Asciidoctor to trip on the
list continuations that follow and to render the pluses literally.
Rewrap a little to put the dash elsewhere.
Signed-off-by: Martin Ågren
---
Documentation/config/fsck.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletion
I've got a W-I-P series to teach our doc-diff tool to diff between
AsciiDoc and Asciidoctor. It looks promising, and here are a few fixes
that fell out from my first round of testing things.
The W-I-P doc-diff is able to find three types of problems, as shown by
these patches. One is where Asciido
Jeff King writes:
> On Wed, Mar 06, 2019 at 12:23:20AM +, Ramsay Jones wrote:
>
>> > Yeah, that's what I was hinting at earlier in the thread. Here it is
>> > sketched out to an actual working patch. The sub-make bits could
>> > actually be a shell script instead of a Makefile; the only point
From: Yash Bhatambare
`UTF-16-LE-BOM` to `UTF-16LE-BOM`.
this closes https://github.com/git-for-windows/git/issues/2095
Signed-off-by: Yash Bhatambare
Signed-off-by: Torsten Bögershausen
---
This patch already made it into Git for Windows,
so I send it upstream "as is".
Documentation/gitatt
On Thu, Feb 28, 2019 at 09:36:26PM +0100, Martin Ågren wrote:
> This is a follow-up to v3 [1] from about a month ago. Patch 1 is
> unchanged; patch 2 provides some additional documentation of the
> initialization that is required, plus I've gotten rid of the compound
> literal. Range-diff below.
On Tue, Mar 05, 2019 at 07:04:59PM +0700, Duy Nguyen wrote:
> On Mon, Feb 4, 2019 at 4:17 PM Christian Couder
> wrote:
> >
> > Hi everyone,
> >
> > There are now ideas, micro-projects and organization application pages
> > for GSoC 2019 on https://git.github.io/
> >
> > It would be nice to have a
Elijah Newren writes:
> Note that there is also a third possibility here:
>
> C) There are different answers depending on the context and content
> that cannot be determined by git, so this is a conflict. Use a
> higher stage in the index to record the conflict and notify the
>
On Wed, Mar 06, 2019 at 10:34:18AM +0900, Junio C Hamano wrote:
> * jk/fsck-doc (2019-03-05) 2 commits
> - fsck: always compute USED flags for unreachable objects
> - doc/fsck: clarify --connectivity-only behavior
>
> "git fsck --connectivity-only" omits computation necessary to sift
> the ob
On Wed, Mar 06, 2019 at 12:23:20AM +, Ramsay Jones wrote:
> > Yeah, that's what I was hinting at earlier in the thread. Here it is
> > sketched out to an actual working patch. The sub-make bits could
> > actually be a shell script instead of a Makefile; the only point in
> > using make is to u
On Wed, Mar 06, 2019 at 10:34:18AM +0900, Junio C Hamano wrote:
> * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
> (merged to 'next' on 2019-02-06 at f4fe5d759a)
> + merge: add scissors line on merge conflict
> + merge: cleanup messages like commit
> + t7600: clean up 'merge --squash c
What's cooking in git.git (Mar 2019, #01; Wed, 6)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear i
On Sat, Mar 2, 2019 at 5:33 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > Whatever we choose for the default could be tweaked by some new option
> > (e.g. make it less noisy or don't mark such paths as conflicted if the
> > user has explicitly stated their preference for or against dir
On 05/03/2019 23:07, Jeff King wrote:
> On Tue, Mar 05, 2019 at 02:50:11PM +0900, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>>> This makes sense to me, though as you noted elsewhere, it doesn't fix
>>> the gcrypt problem, since that file unconditionally wants to look at the
>>> system gc
If the GCRYPT_SHA256 build variable is not set, then the 'hdr-check'
target complains about the missing header file. Add the
'sha256/gcrypt.h' header file to the exception list, if the build
variable is not defined. While here, replace the 'xdiff%' filter
pattern with 'xdiff/%' (and similarly fo
Jeff King writes:
> ... I do think the documentation
> should recommend "now". Possibly builtin/gc.c should be smarter about
> recognizing "all" in the conditional you quoted, too, though I don't
> know that it's all that important (especially if we tweak the
> documentation).
Yup, as the placeh
Rafael Ascensão writes:
> As Junio mentioned, "A..B" means all commits reachable from B except those
> reachable from A. Understanding this is just a way to say "B --not A" is
> important to know you can take advantage of:
>
> `--boundary`
> Output excluded boundary commits. Boundary commits
Junio C Hamano writes:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
>> As suggested by Jeff King in a nearby thread.
>>
>> Johannes Schindelin (1):
>> remote-curl: mark all error messages for translation
>
> Does this come on top or below the anonymize patch, or it does not
> matter wh
This exercise of estimating a good spot to gain performance with
parallelism at git seems more difficult than I thought, firstly. Also,
I'm not that familiar yet with git packing (neither with the sections
of it that could benefit from parallelism). So could anyone point me
some good references on
"Johannes Schindelin via GitGitGadget"
writes:
> As suggested by Jeff King in a nearby thread.
>
> Johannes Schindelin (1):
> remote-curl: mark all error messages for translation
Does this come on top or below the anonymize patch, or it does not
matter which goes first?
>
> remote-curl.c | 5
Jeff King writes:
> TBH, I still have mixed feelings on rendering these technical docs with
> asciidoc at all. It seems like few enough people bother to render them
> that bugs persist for a long time. It kind of seems like make-work
> getting them to format correctly.
I thought about resisting
As Junio mentioned, "A..B" means all commits reachable from B except those
reachable from A. Understanding this is just a way to say "B --not A" is
important to know you can take advantage of:
`--boundary`
Output excluded boundary commits. Boundary commits are prefixed with -.
In other words,
Hey Eric
On Tue, 5 Mar 2019 09:57:40 -0500 Eric Sunshine wrote:
> This patch, due to its length and repetitive nature, falls under the
> category of being tedious to review, which makes it all the more
> likely that a reviewer will overlook a problem.
Yes, I clearly understand that this patch ha
git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for
correctness and replace "wrt" with "with respect to" so that the
documentation is not so cryptic.
Signed-off-by: Denton Liu
---
My mistake, I fired off the email before it was ready.
---
Documentation/git-reset.txt | 3 ++
From: Johannes Schindelin
Suggested by Jeff King.
Signed-off-by: Johannes Schindelin
---
remote-curl.c | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index 6be3cb5918..06f091d862 100644
---
As suggested by Jeff King in a nearby thread.
Johannes Schindelin (1):
remote-curl: mark all error messages for translation
remote-curl.c | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
base-commit: c1284b21f2436de24c9559fcc5f4badb04
On Tue, Mar 05, 2019 at 06:02:27PM -0500, Jeff King wrote:
> On Wed, Mar 06, 2019 at 07:54:20AM +0900, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > Did you notice this when building locally, or on the asciidoctor-built
> > > pages at git-scm.com?
> >
> > Does git-scm.com even have t
On Tue, Mar 05, 2019 at 02:50:11PM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > This makes sense to me, though as you noted elsewhere, it doesn't fix
> > the gcrypt problem, since that file unconditionally wants to look at the
> > system gcrypt.h (and we control at the Makefile level w
First of all, I must apologize for not replying during these last
days. I'm traveling and I rarely get a connection here. But I'll be
back March 11th.
On Sun, Mar 3, 2019 at 4:18 AM Christian Couder
wrote:
>
> On Sat, Mar 2, 2019 at 4:09 PM Thomas Gummerer wrote:
> >
> > I'm a bit wary of a too
On Wed, Mar 06, 2019 at 07:54:20AM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > Did you notice this when building locally, or on the asciidoctor-built
> > pages at git-scm.com?
>
> Does git-scm.com even have this file rendered? I do not think we
> glob for technical/*.txt in any of o
Hi Peff,
On Tue, 5 Mar 2019, Jeff King wrote:
> On Mon, Mar 04, 2019 at 07:33:46AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > @@ -442,17 +443,23 @@ static struct discovery *discover_refs(const char
> > *service, int for_push)
> > break;
> > case HTTP_MISSING_TAR
Jeff King writes:
> Did you notice this when building locally, or on the asciidoctor-built
> pages at git-scm.com?
Does git-scm.com even have this file rendered? I do not think we
glob for technical/*.txt in any of our Makefiles; instead we have a
list of ready-to-be-consumed TECH_DOCS listed e
Denton Liu writes:
> Should reflowing the text be done in a separate patch or should it just
> not be done at all and just be considered noise?
Of course when the rewrite is so extensive that the two versions of
the whole paragraph needs to be carefully read and compared to judge
if the change i
Jean-Noël Avila writes:
> The end of sentence in "x." at the begining of a line misleads
> ascidoctor into interpreting it as the start of numbered sub-list.
Wow. That's tricky.
One thing that makes me wonder is how you found it, as I do not
think this file is part of the set of Documentation/
Hi Junio,
On Wed, Mar 06, 2019 at 07:30:40AM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for
> > correctness and replace "wrt" with "with respect to" so that the
> > documentation is not so cryptic.
>
> Could you t
On Tue, Mar 05, 2019 at 10:44:23PM +0100, Jean-Noël Avila wrote:
> The end of sentence in "x." at the begining of a line misleads
> ascidoctor into interpreting it as the start of numbered sub-list.
Because I'd been wanting to play with doc-diff and asciidoctor, I tried
looking at the rendered di
Denton Liu writes:
> git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for
> correctness and replace "wrt" with "with respect to" so that the
> documentation is not so cryptic.
Could you try again without unrelated reflowing of the text?
Thanks.
>
> Signed-off-by: Denton Liu
Johannes Schindelin writes:
>> After a normal build, with dynamic dependency checking on, we would
>> have sufficient information to figure it out. Would that help?
>
> Yes, *if* the dynamic dependency checking is in effect (read: if we are
> compiling with GCC).
>
> However, I think that one of
The end of sentence in "x." at the begining of a line misleads
ascidoctor into interpreting it as the start of numbered sub-list.
Signed-off-by: Jean-Noël Avila
---
Documentation/technical/directory-rename-detection.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Docu
Hi,
On 03/05, Sushma Unnibhavi wrote:
> I am planning to do a microproject on using unsigned integral type
> for collection of bits.If anyone else has not taken it up,I would
> like to work on it.
Welcome to the Git project!
We generally do not assign micro-projects to someone in particular.
If
On Tue, Mar 05, 2019 at 10:33:13PM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> >> Or teach git-blame to have its own pretend mechanism, and remove the
> >> pretend mechanism from sha1-file.c.
> >
> > I think that would be ideal, but I'm not sure if it's feasible due to
> > the layering
edit_todo_list() is changed to work on a todo_list, and to handle the
initial edition of the todo list (ie. making a backup of the todo
list).
It does not check for dropped commits yet, as todo_list_check() does not
take the commits that have already been processed by the rebase (ie. the
todo list
This moves the writing of the comment "Rebase $shortrevisions onto
$shortonto ($command_count commands)" from todo_list_write_to_file() to
append_todo_help().
shortrevisions, shortonto, and command_count are passed as parameters to
append_todo_help().
During the initial edit of the todo list, sho
Just like complete_action(), edit_todo_list() used a
function (transform_todo_file()) that read the todo list from the disk
and wrote it back, resulting in useless disk accesses.
This changes edit_todo_list() to call directly todo_list_write_to_file()
instead.
Signed-off-by: Alban Gruin
---
No c
This changes complete_action() to use edit_todo_list(), now that it can
handle the initial edit of the todo list.
Signed-off-by: Alban Gruin
---
No changes since v7.
sequencer.c | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/sequencer.c b/sequencer.c
As sequencer_add_exec_commands() is only needed inside of
rebase--interactive.c for `rebase -p', it is moved there from
sequencer.c.
The parameter r (repository) is dropped along the way.
Signed-off-by: Alban Gruin
---
New commit, but was a part of "rebase--interactive: move several
functions to
As transform_todo_file() is only needed inside of
rebase--interactive.c for `rebase -p', it is moved there from
sequencer.c.
The parameter r (repository) is dropped along the way.
Signed-off-by: Alban Gruin
---
New commit, but was a part of "rebase--interactive: move several
functions to rebase-
As rearrange_squash_in_todo_file() is only needed inside of
rebase--interactive.c for `rebase -p', it is moved there from
sequencer.c.
The parameter r (repository) is dropped along the way, and the error
handling is slightly improved.
Signed-off-by: Alban Gruin
---
New commit, but was a part of
complete_action() used functions that read the todo-list file, made some
changes to it, and wrote it back to the disk.
The previous commits were dedicated to separate the part that deals with
the file from the actual logic of these functions. Now that this is
done, we can call directly the "logic
This refactors skip_unnecessary_picks() to work on a todo_list. As this
function is only called by complete_action() (and thus is not used by
rebase -p), the file-handling logic is completely dropped here.
Instead of truncating the todo list’s buffer, the items are moved to
the beginning of the l
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
Instead of inserting the `exec' commands between the other commands and
re-parsing the buffer at the end, they are appended to the buffer once,
and a new list of items is created.
This introduces a new function to recreate the text of a todo list from
its commands and write it to a file. This will be useful as the next
few commits will change the use of the buffer in struct todo_list so it
will no longer be a mirror of the file on disk.
This functionality already exists in
This refactors check_todo_list() to work on a todo_list to avoid
redundant reads and writes to the disk. The function is renamed
todo_list_check(). The parsing of the two todo lists is left to the
caller.
As rebase -p still need to check the todo list from the disk, a new
function is introduced,
This refactors rearrange_squash() to work on a todo_list to avoid
redundant reads and writes. The function is renamed
todo_list_rearrange_squash().
The old version created a new buffer, which was directly written to the
disk. This new version creates a new item list by just copying items
from th
This makes the structures todo_list and todo_item, and the functions
todo_list_release() and parse_insn_buffer(), accessible outside of
sequencer.c.
Signed-off-by: Alban Gruin
---
No changes since v7.
sequencer.c | 69 ++---
sequencer.h | 50 +
This makes sequencer_make_script() write its script to a strbuf (ie. the
buffer of a todo_list) instead of a FILE. This reduce the amount of
read/write made by rebase interactive.
Signed-off-by: Alban Gruin
---
No changes since v7.
builtin/rebase--interactive.c | 13 ++-
sequencer.c
At the center of the "interactive" part of the interactive rebase lies
the todo list. When the user starts an interactive rebase, a todo list
is generated, presented to the user (who then edits it using a text
editor), read back, and then is checked and processed before the actual
rebase takes pla
The 'arg' field of todo_item used to store the address of the first byte
of the parameter of a command in a todo list. It was associated with
the length of the parameter (the 'arg_len' field).
This replaces the 'arg' field by 'arg_offset'. This new field does not
store the address of the paramet
This refactors transform_todos() to work on a todo_list. The function
is renamed todo_list_transform().
As rebase -p still need to check the todo list from the disk, a new
function is introduced, transform_todo_file(). It is still used by
complete_action() and edit_todo_list() for now, but they
This clears the number of items of a todo_list before parsing it to
allow to parse the same list multiple times without issues. As its
items are not dynamically allocated, or don’t need to allocate memory,
no additionnal memory management is required here.
Furthermore, if a line is invalid, the t
On Mon, Mar 04, 2019 at 03:40:07PM -0500, Jeff King wrote:
> You can patch the Makefile, or just override it like:
>
> make LIBS='-lcrypto -lz'
>
> which builds for me on current Debian unstable. I don't think you can
> actually fetch with that old build, but I used periodically check that
> G
git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for
correctness and replace "wrt" with "with respect to" so that the
documentation is not so cryptic.
Signed-off-by: Denton Liu
---
Documentation/git-reset.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
d
Thank you Jeff I'll have news within few days!!!
Il giorno lun, 04/03/2019 alle 15.40 -0500, Jeff King ha scritto:
> On Mon, Mar 04, 2019 at 08:58:37PM +0100, Fabio Aiuto wrote:
>
> > I'm trying to build first commit of git made by Linus. I mean the
> > one
> > named e83c5163316f89bfbde7d9ab23..
On Tue, Mar 5, 2019 at 7:21 AM Junio C Hamano wrote:
>
> Kenneth Cochran writes:
>
> > From c1bad54b29ae1c1d8548d248f6ecaa5959e55f7b Mon Sep 17 00:00:00 2001
> > From: Kenneth Cochran
> > Date: Mon, 4 Mar 2019 09:40:22 -0600
> > Subject: [RFC PATCH 0/4] Add alias option to git branch
> > Cc: Sah
Hi Peff,
On Sun, 3 Mar 2019, Jeff King wrote:
> On Sat, Mar 02, 2019 at 09:25:28PM +0100, Johannes Schindelin wrote:
>
> > > This bug has survived because there was never a test that would have
> > > caught it. The old test used 'test_decode_color', which checks that its
> > > input begins with
Rather than parse options manually, which is both difficult to
read and error prone, parse options supplied to commit-tree
using the parse-options api.
It was discovered that the --no-gpg-sign option was documented
but not implemented in commit 70ddbd7767 (commit-tree: add missing
--gpg-sign flag,
On Tue, Mar 5, 2019 at 7:32 AM Nguyễn Thái Ngọc Duy wrote:
> diff --git a/diff.c b/diff.c
> @@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options
> *options)
> + OPT_BOOL(0, "quiet", &options->flags.quick,
> +N_("disable all output of the p
Hi Junio,
On Tue, 5 Mar 2019, Junio C Hamano wrote:
> Jeff King writes:
>
> > This makes sense to me, though as you noted elsewhere, it doesn't fix
> > the gcrypt problem, since that file unconditionally wants to look at the
> > system gcrypt.h (and we control at the Makefile level whether we
>
On Tue, Mar 5, 2019 at 9:22 AM Rohit Ashiwal wrote:
> I was asking if this patch is good enough to be added to the
> existing code? Does this patch look good?
I didn't review the patch with a critical-enough eye to be able to say
that every change maintains fidelity with the original code. As
men
Eric
I was asking if this patch is good enough to be added to the existing code?
Does this patch look good?
Regards
Rohit
On Tue, 5 Mar 2019, Junio C Hamano wrote:
> "Robert P. J. Day" writes:
>
> > Currently, all of the examples for "man git-rebase" show rebasing from
> > a branch that has had no further development, which might mislead
> > readers into thinking that that is a necessary condition for rebasing,
> >
"Robert P. J. Day" writes:
> Currently, all of the examples for "man git-rebase" show rebasing from
> a branch that has had no further development, which might mislead
> readers into thinking that that is a necessary condition for rebasing,
> so tweak the examples to show further development on s
On Tue, Mar 5, 2019 at 8:43 AM Rohit Ashiwal wrote:
> On 2019-03-05 0:42 Eric Sunshine wrote:
> > As with the commit message of 2/3, many of the words in this message
> > are separated by multiple spaced. Please fold out the excess so there
> > is only a single space between words.
> >
> > Also,
Christian Couder writes:
> Hi,
>
> On Tue, Mar 5, 2019 at 10:00 AM wuzhouhui
> wrote:
>>
>> Suppose I have "git format-patch" two commit from a repository like
>> following:
>>
>> git format-patch -1 cf1c9ccba730
>> git format-patch -1 d1a2930d8a99
>>
>> Now, how to determine the commit ord
Hey Eric
On 2019-03-05 0:42 Eric Sunshine wrote:
> As with the commit message of 2/3, many of the words in this message
> are separated by multiple spaced. Please fold out the excess so there
> is only a single space between words.
>
> Also, no need to say "previously" since readers know that the
Jeff King writes:
>> Or teach git-blame to have its own pretend mechanism, and remove the
>> pretend mechanism from sha1-file.c.
>
> I think that would be ideal, but I'm not sure if it's feasible due to
> the layering of the various modules.
Sorry, but I do not get why we want command-line speci
Jeff King writes:
> This fixes a regression in 7c0fe330d5 (rev-list: handle missing tree
> objects properly, 2018-10-05) where rev-list will now complain about the
> empty tree when it doesn't physically exist on disk.
>
> Before that commit, we relied on the traversal code in list-objects.c to
>
Hello Eric
On 2019-03-04 19:17:50 -0500 Eric Sunshine wrote:
> On Mon, Mar 4, 2019 at 7:08 AM Rohit Ashiwal
> wrote:
> > if ! test -s "$1"
> > then
> > echo "'$1' is not a non-empty file."
>
> Although not incorrect, the double-negative is hard to digest. I had
> to read it a few times to c
Kenneth Cochran writes:
> From c1bad54b29ae1c1d8548d248f6ecaa5959e55f7b Mon Sep 17 00:00:00 2001
> From: Kenneth Cochran
> Date: Mon, 4 Mar 2019 09:40:22 -0600
> Subject: [RFC PATCH 0/4] Add alias option to git branch
> Cc: Sahil Dua ,
> Duy Nguyen ,
> Jeff King
Avoid using these in-bo
> On Mar 5, 2019, at 8:39 PM, Christian Couder
> wrote:
>
> Hi,
>
> On Tue, Mar 5, 2019 at 10:00 AM wuzhouhui
> wrote:
>>
>> Suppose I have "git format-patch" two commit from a repository like
>> following:
>>
>> git format-patch -1 cf1c9ccba730
>> git format-patch -1 d1a2930d8a99
>>
>
On Tue, 5 Mar 2019, Junio C Hamano wrote:
> "Robert P. J. Day" writes:
>
> > one of the things i've noticed about the examples in "man
> > git-rebase" is that they invariably show rebasing relative to a
> > branch point that has not moved. for example, there's this example:
> >
> >o---o
"Robert P. J. Day" writes:
> one of the things i've noticed about the examples in "man
> git-rebase" is that they invariably show rebasing relative to a
> branch point that has not moved. for example, there's this example:
>
>o---o---o---o---o master
> \
> o---
On Tue, Mar 5, 2019 at 11:51 AM Jeff King wrote:
> > processing power from multiple cores, but about _not_ blocking. I
> > think one example use case here is parallel checkout. While one thread
> > is blocked by pack access code for whatever reason, the others can
> > still continue doing other st
Eric Sunshine writes:
> This test is unusual in that it first cd's into a subdirectory and
> then cd's back out with "cd ..". And, while the use of subshells is
> correct to ensure that all 'cd' commands are undone at the end of the
> test (whether successful or not), the entire construction is
>
Eric Sunshine writes:
>> +test_file_not_empty () {
>> + if ! test -s "$1"
>> + then
>> + echo "'$1' is not a non-empty file."
>
> Although not incorrect, the double-negative is hard to digest. I had
> to read it a few times to convince myself that it matched the intent
>
Hi,
On Tue, Mar 5, 2019 at 10:00 AM wuzhouhui wrote:
>
> Suppose I have "git format-patch" two commit from a repository like
> following:
>
> git format-patch -1 cf1c9ccba730
> git format-patch -1 d1a2930d8a99
>
> Now, how to determine the commit order of these two patch in repository?
Do yo
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/diff.c b/diff.c
index 6fd6106963..ce118bb326 100644
--- a/diff.c
+++ b/diff.c
@@ -4721,14 +4721,6 @@ static int parse_dirstat_opt(struct diff_options
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index a27bca527d..6fd6106963 100644
--- a/diff.c
+++ b/diff.c
@@ -5013,6 +5013,19 @@ static int diff_opt_follow(const struct option *opt,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c
index b460fa010b..a27bca527d 100644
--- a/diff.c
+++ b/diff.c
@@ -5062,6 +5062,21 @@ static int diff_opt_relative(const struct option *opt,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index bd15269346..b460fa010b 100644
--- a/diff.c
+++ b/diff.c
@@ -5301,6 +5301,8 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 3f80e06de5..bd15269346 100644
--- a/diff.c
+++ b/diff.c
@@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 47 +--
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/diff.c b/diff.c
index bb36d507ec..14c057f3df 100644
--- a/diff.c
+++ b/diff.c
@@ -5066,6 +5066,32 @@ static int diff_opt_unified(con
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 5180c2f5a9..3f80e06de5 100644
--- a/diff.c
+++ b/diff.c
@@ -5297,6 +5297,8 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c
index 14c057f3df..634981723b 100644
--- a/diff.c
+++ b/diff.c
@@ -5092,6 +5092,18 @@ static int diff_opt_word_diff(const struct option *opt,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index ad813ea418..bb36d507ec 100644
--- a/diff.c
+++ b/diff.c
@@ -5148,6 +5148,8 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index 634981723b..5180c2f5a9 100644
--- a/diff.c
+++ b/diff.c
@@ -4901,6 +4901,18 @@ static int diff_opt_char(const struct option *opt,
1 - 100 of 119 matches
Mail list logo
