Signed-off-by: Eric Sunshine
---
Jonathan's discovery[1] of a broken &&-chain in a contrib/subtree test
prompted me to check other tests bundled in contrib/. This was the
only other problem found. Unlike the subtree &&-chain case, this
breakage is at the top-level, thus was caug
On Mon, Jul 30, 2018 at 2:14 PM Jonathan Nieder wrote:
> Eric Sunshine wrote:
> > Address this shortcoming by feeding the body of the test to a
> > lightweight "linter" which can peer inside subshells and identify broken
> > &&-chains by pure textual
On Mon, Jul 30, 2018 at 11:47 AM Johannes Schindelin
wrote:
> On Mon, 30 Jul 2018, Eric Sunshine wrote:
> > Unfortunately, after sending this series, I see that there is
> > additional corruption that needs to be addressed. In particular, the
> > "author" head
On Mon, Jul 30, 2018 at 8:14 AM Phillip Wood wrote:
> On 30/07/18 10:29, Eric Sunshine wrote:
> > It was only after I diagnosed and fixed these bugs that I thought to
> > check 'pu' and discovered that Akinori MUSHA already made a stab[1] at
> > fixing one of the three b
On Mon, Jul 30, 2018 at 8:26 AM Han-Wen Nienhuys wrote:
> ---
> config.h | 10 --
> 1 file changed, 8 insertions(+), 2 deletions(-)
Missing sign-off.
On Mon, Jul 30, 2018 at 8:20 AM Phillip Wood wrote:
> On 30/07/18 10:29, Eric Sunshine wrote:
> > When "git rebase -i --root" creates a new root commit, it corrupts the
> > "author" header's timezone by repeating the last digit:
> > [...]
> > Signe
On Mon, Jul 30, 2018 at 5:30 AM Eric Sunshine wrote:
> This series fixes bugs causing corruption of the root commit when
> "rebase -i --root" is used to swap in a new root commit. In particular,
> the "author" header has trailing garbage. Some tools handle the
>
NUL-terminate the constructed "author" header, memory is
never accessed (either by read_author_ident() or its caller) beyond the
allocated buffer since a NUL-terminator is present at the end of the
loaded "rebase-merge/author-script" content, and additional NUL's are
inserted as part of the
removing quoting and
shifting content downward. When it detects misquoting (lack of closing
quote, in this case), it gives up and returns an error without inserting
a NUL-terminator at the end of the shifted content, which explains the
duplicated last digit in the timezone.
Signed-off-by: E
by this series.
[1]: https://public-inbox.org/git/86a7qwpt9g@idaemons.org/
[2]:
https://public-inbox.org/git/f5b56540-d26a-044e-5f46-1d975f889...@talktalk.net/
Eric Sunshine (2):
sequencer: fix "rebase -i --root" corrupting author header
sequencer: fix "rebase -i --root"
On Sun, Jul 29, 2018 at 9:13 AM Jakub Narebski wrote:
> Sidenote: the GitGitGadget doesn't fold/wrap lines properly in the
> cover-letter. Not that it is much of a problem.
Stefan opened a ticket at the gitgitgadget project:
https://github.com/gitgitgadget/gitgitgadget/issues/26
On Sun, Jul 29, 2018 at 3:04 PM Thomas Gummerer wrote:
> On 07/21, Johannes Schindelin via GitGitGadget wrote:
> > Just like tbdiff, we now show the diff between matching patches. This is
> > a "diff of two diffs", so it can be a bit daunting to read for the
> > beginner.
> > [...]
> > Note also:
On Sat, Jul 28, 2018 at 6:51 PM Ramsay Jones
wrote:
> Commit 6c213e863a ("http-backend: respect CONTENT_LENGTH for
> receive-pack", 2018-07-27) adds a test which uses the non-portable
> export construct. Replace it with "FOO=bar && export FOO" instead.
>
> Signed-off-by: Ramsay Jones
> ---
>
On Fri, Jul 27, 2018 at 11:05 PM Stefan Beller wrote:
> emit_line_0 has no nested conditions, but puts out all its arguments
> (if set) in order. There is still a slight confusion with set
> and set_sign, but let's defer that to a later patch.
>
> 'first' used be output always no matter if it was
On Fri, Jul 27, 2018 at 11:05 PM Stefan Beller wrote:
> For now just change the signature, we'll reason about the actual
> change in a follow up patch.
>
> Pass set_sign (which is output before the sign) and set that is setting
> the color after the sign. Hence, promote any 'set's to set_sign as
On Fri, Jul 27, 2018 at 11:05 PM Stefan Beller wrote:
> The 'expect'ed outcome is taken by running the 'range-diff |decode';
> it is not meant as guidance, rather as a documentation of the current
> situation.
I'm not really sure what this is trying to say. It seems _too_ brief.
Did you want a
On Fri, Jul 27, 2018 at 7:22 AM Chen Bin wrote:
> The `p4-pre-submit` hook is executed before git-p4 submits code.
> If the hook exits with non-zero value, submit process not start.
>
> Signed-off-by: Chen Bin
> ---
> diff --git a/git-p4.py b/git-p4.py
> @@ -1494,7 +1494,13 @@ def
On Thu, Jul 26, 2018 at 12:49 PM Junio C Hamano wrote:
> Chen Bin writes:
> > + git p4 submit --dry-run >out && grep "Would apply" out ||
> > echo "Abort submit"
>
> What is this last "|| echo I always succeed" about?
>
> Do you want to make sure "git p4 submit" exit with non-zero
On Thu, Jul 26, 2018 at 6:56 AM Johannes Schindelin
wrote:
> On Tue, 17 Jul 2018, Eric Sunshine wrote:
> > On Tue, Jul 17, 2018 at 6:31 AM Johannes Schindelin
> > wrote:
> > > BTW I like to have an extra space in front of all the range-diff lines, to
> > > ma
On Thu, Jul 26, 2018 at 2:59 PM Eric Sunshine wrote:
> On Thu, Jul 26, 2018 at 11:04 AM Junio C Hamano wrote:
> > If there were a simple and futureproof way to tell the option
> > parsing loop to notice any feature other than "-b newbranch" was
> > used, then such
On Thu, Jul 26, 2018 at 11:04 AM Junio C Hamano wrote:
> Ben Peart writes:
> > I'm not thrilled with the long list either (the plethora of comments
> > probably makes it appear worse than it is) but I don't see how...
>
> If there were a simple and futureproof way to tell the option
> parsing
On Wed, Jul 25, 2018 at 10:08 PM chen bin wrote:
> The hook does not receive any information or input from git. The
> original requirement
> comes from my colleague. He want to run unit test automatically before
> submitting code
> to remote repository. Or else CI server will send the blame mail
On Thu, Jul 26, 2018 at 1:01 AM Vishwas Kamath wrote:
> I am unable to use Git (version 2.18 latest). Since i couldnt find any
> help/support/contact email on https://git-scm.com and i couldnt find the
> solution using Google as well i am directly contacting you as i need to get
> git working.
On Wed, Jul 25, 2018 at 9:45 AM Chen Bin wrote:
> Hook pre-p4-submit is executed before git-p4 actually submits code.
> If the hook exits with non-zero value, submit process will abort.
Bikeshedding: Should this be named 'p4-pre-submit'? That way, if
git-p4 ever grows additional hooks, they can
On Wed, Jul 25, 2018 at 1:29 PM Junio C Hamano wrote:
> A few random thoughts.
>
> * I find it somewhat disturbing that use of dash is inconsistent
>between "--interdiff=" and "--range-diff=".
I went with the common spellings we've seen on the mailing lists.
"Interdiff", in particular,
On Tue, Jul 24, 2018 at 6:17 PM brian m. carlson
wrote:
> On Mon, Jun 11, 2018 at 03:47:43AM -0400, Eric Sunshine wrote:
> > Here's what I had envisioned when reading your emails about OID lookup
> > table functionality:
> >
> > --- >8 ---
> > test_oid_ca
On Tue, Jul 24, 2018 at 6:09 PM Jonathan Nieder wrote:
> Eric Sunshine wrote:
> > Subject: diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
>
> It would be clearer to say something like
>
> diff --color-moved: add "dimmed-zebr
recate "dimmed_zebra".
Signed-off-by: Eric Sunshine
---
Documentation/diff-options.txt | 3 ++-
diff.c | 4 +++-
t/t4015-diff-whitespace.sh | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/dif
On Tue, Jul 24, 2018 at 2:01 PM Ben Peart wrote:
> If the new core.optimizecheckout config setting is set to true, speed up
Maybe:
Add core.optimizeCheckout config setting which, when true, speeds up
> "git checkout -b foo" by avoiding the work to merge the working tree. This
> is valid
On Tue, Jul 24, 2018 at 10:43 AM wrote:
> Replace non-standard "\e" escape sequence with "\x1B".
>
> In commit 7a17918c34f4e83982456ffe22d880c3cda5384f a trace message with
> several "\e" escape sequences was added. This causes a compiler warning
> under MSVC.
Wrong commit. That code was
On Tue, Jul 24, 2018 at 5:26 AM Jeff King wrote:
> 1. We'll only trigger with -Wimplicit-function-declaration
> (and only stop compilation with -Werror). These are
> generally enabled by DEVELOPER=1. If you _don't_ have
> that set, we'll still catch the problem, but only at
>
t/CABNJ2G+h3zh+=wLA0KHjUn8TsfhqUK1Kn-1_=6hnxvrjuph...@mail.gmail.com/
Reported-by: Evgeny Cherpak
Signed-off-by: Eric Sunshine
---
Lack of 'catch' in the 'osascript' invocation in gitk was recognized as
a potential problem as far back as June 2013 [3,4]; now it's biting
"Mojave" users,
On Mon, Jul 23, 2018 at 6:59 PM Stefan Beller wrote:
> On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine wrote:
> > The actual diffs output by range-diff respect diff_option.file, which
> > range-diff passes down the call-chain, thus are destination-agnostic.
> > Howeve
On Mon, Jul 23, 2018 at 12:32 PM Duy Nguyen wrote:
> On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine
> wrote:
> > When re-submitting a patch series, it is often helpful (for reviewers)
> > to include an interdiff or range-diff against the previous version.
> > Doing so r
On Mon, Jul 23, 2018 at 12:28 PM Duy Nguyen wrote:
> On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine
> wrote:
> > diff --git a/Documentation/git-format-patch.txt
> > b/Documentation/git-format-patch.txt
> > index f8a061794d..e7f404be3d 100644
> > --- a/Docu
On Mon, Jul 23, 2018 at 12:22 PM Duy Nguyen wrote:
> On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine
> wrote:
> > + if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) {
>
> OK putting idiff stuff in rev_info is probably the right choice. But
> we all three fi
On Mon, Jul 23, 2018 at 12:12 PM Duy Nguyen wrote:
> On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine
> wrote:
> > @@ -215,6 +215,7 @@ struct rev_info {
> > /* interdiff */
> > const struct object_id *idiff_oid1;
> > const struct object_id
On Mon, Jul 23, 2018 at 12:03 PM Duy Nguyen wrote:
> On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine
> wrote:
> > @@ -0,0 +1,17 @@
> > +void show_interdiff(struct rev_info *rev)
> > +{
> > + struct diff_options opts;
> > +
> &
On Mon, Jul 23, 2018 at 2:44 PM SZEDER Gábor wrote:
> On Mon, Jul 23, 2018 at 8:28 PM Eric Sunshine wrote:
> > On Mon, Jul 23, 2018 at 9:51 AM SZEDER Gábor wrote:
> > > +ifdef DC_SHA1_SUBMODULE
> > > +COCCI_SOURCES = $(filter-out sha1collisiondetection/
On Mon, Jul 23, 2018 at 9:51 AM SZEDER Gábor wrote:
> sha1dc is an external library, that we carry in-tree for convenience
> or grab as a submodule, so there is no use in applying our semantic
> patches to its source files.
>
> Therefore, exclude sha1dc's source files from Coccinelle's static
>
On Mon, Jul 23, 2018 at 9:12 AM Ben Peart wrote:
> On 7/21/2018 3:21 AM, Eric Sunshine wrote:
> > On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren wrote:
> >> + rm .git/info/sparse-checkout
> >
> > Should this cleanup be done by test_when_finishe
On Sun, Jul 22, 2018 at 5:57 AM Eric Sunshine wrote:
> Add an --interdiff option to automate this process. The argument to
> --interdiff specifies the tip of the previous attempt against which to
> generate the interdiff.
>
> Signed-off-by: Eric Sunshine
> ---
> diff
tion while generating the range-diff, and restore it
after.
Signed-off-by: Eric Sunshine
---
Documentation/git-format-patch.txt | 3 ++-
builtin/log.c | 9 +
log-tree.c | 15 +++
3 files changed, 22 insertions(+), 5 deletions(-)
git-range-diff command
No interdiff or range-diff is included in this cover-letter since the
implementation changed dramatically.
[1]: https://public-inbox.org/git/pull.1.v4.git.gitgitgad...@gmail.com/
[2]:
https://public-inbox.org/git/20180530080325.37520-1-sunsh...@sunshineco.com/
Eric Sunshine
clobber the caller-provided
'diff_options', which might be used beyond range-diff generation.
Signed-off-by: Eric Sunshine
---
builtin/range-diff.c | 23 ---
range-diff.c | 24 ++--
range-diff.h | 3 ++-
3 files changed, 28 insertions(+), 22
this since it uses global state.
Consequently, we need to take care to stash away the state of the
in-progress operation while generating the interdiff, and restore it
after.
Signed-off-by: Eric Sunshine
---
Documentation/git-format-patch.txt | 3 ++-
builtin/log.c | 8 +++
the commit message so that it can be re-used for upcoming
optional inserted content.
Signed-off-by: Eric Sunshine
---
log-tree.c | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/log-tree.c b/log-tree.c
index 4a3907fea0..9d38f1cf79 100644
--- a/log-tree.c
ault range factor to allow new callers of the range-diff
back-end to default to the same value without duplicating the hard-coded
constant, and to avoid worrying about various callers becoming
out-of-sync if the default ever needs to change.
Signed-off-by: Eric Sunshine
---
builtin/range-diff.c | 2
ore, teach show_interdiff() how to indent.
Signed-off-by: Eric Sunshine
---
builtin/log.c | 2 +-
interdiff.c | 13 -
interdiff.h | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 99ddfe8bb0..8078a43d14 100644
--- a/builtin/log.c
+++
generating a range-diff for a cover-letter.
Signed-off-by: Eric Sunshine
---
Documentation/git-format-patch.txt | 8 +++-
builtin/log.c | 10 +-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git
The --interdiff option introduces the embedded interdiff generically as
"Interdiff:", however, we can do better when --reroll-count is specified
by emitting "Interdiff against v{n}:" instead.
Signed-off-by: Eric Sunshine
---
builtin/log.c | 17 +
without otherwise inhibiting normal control flow.
Signed-off-by: Eric Sunshine
---
builtin/log.c | 43 +++
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 805f89d7e1..873aabcf40 100644
--- a/builtin/log.c
The --range-diff option announces the embedded range-diff generically
as "Range-diff:", however, we can do better when --reroll-count is
specified by emitting "Range-diff against v{n}:" instead.
Signed-off-by: Eric Sunshine
---
builtin/log.c | 7 ++-
revision.h| 1 +
-by: Eric Sunshine
---
range-diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/range-diff.c b/range-diff.c
index 347b4a79f2..76e053c2b2 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -328,7 +328,7 @@ static void output_pair_header(struct diff_options *diffopt
this process. The argument to
--interdiff specifies the tip of the previous attempt against which to
generate the interdiff. For example:
git format-patch --cover-letter --interdiff=v1 -3 v2
The previous attempt and the patch series being formatted must share a
common base.
Signed-off-by: Eric
, however, a subsequent enhancement
will make it possible to specify an explicit revision range for the
previous attempt.)
Signed-off-by: Eric Sunshine
---
Documentation/git-format-patch.txt | 10 +
builtin/log.c | 35 ++
revision.h
-patch --cover-letter --range-diff=v1~3..v1 -3 v2
Signed-off-by: Eric Sunshine
---
Documentation/git-format-patch.txt | 8 +---
builtin/log.c | 16 +---
t/t3206-range-diff.sh | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git
On Sat, Jul 21, 2018 at 6:05 PM Johannes Schindelin via GitGitGadget
wrote:
> Tab completion of `git range-diff` is very convenient, especially
> given that the revision arguments to specify the commit ranges to
> compare are typically more complex than, say, what is normally passed
> to `git
On Sat, Jul 21, 2018 at 6:05 PM Thomas Rast via GitGitGadget
wrote:
> These are essentially lifted from https://github.com/trast/tbdiff, with
> light touch-ups to account for the command now being names `git
s/names/named/
> range-diff`.
>
> Apart from renaming `tbdiff` to `range-diff`, only
On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren wrote:
> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
> @@ -392,4 +392,17 @@ test_expect_success 'commit --amend -s places the
> sign-off at the right place' '
> +test_expect_failure 'failed cherry-pick with
On Fri, Jul 20, 2018 at 1:20 PM Derrick Stolee wrote:
> Here is the diff between v1 and v2.
>
> diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
> @@ -67,142 +67,176 @@ test_three_modes () {
> test_expect_success 'get_merge_bases_many' '
> cat >input <<-\EOF &&
> +
[re-adding cc:git]
On Fri, Jul 20, 2018 at 12:38 AM Evgeny Cherpak wrote:
> > On 20 Jul 2018, at 7:30, Eric Sunshine wrote:
> >
> > On Fri, Jul 20, 2018 at 12:11 AM Evgeny Cherpak wrote:
> >> Not sure what you referring to?
> >> Is it alternative to gitk? H
On Thu, Jul 19, 2018 at 9:37 PM Jeffrey Walton wrote:
> I'm working from the 2.18 tarball on Solaris 11.3 x86_64. I'm catching
> the following when building from sources. This appears to be a new
> issue. It was not present in 2.17.1.
>
> gmake: *** No rule to make target `git-daemon'. Stop.
On Thu, Jul 19, 2018 at 5:27 PM Jeff King wrote:
> On Thu, Jul 19, 2018 at 05:11:15PM -0400, Eric Sunshine wrote:
> > On Thu, Jul 19, 2018 at 4:39 PM Jeff King wrote:
> > > + * This header lists functions that have been banned from our code base,
> > > + * because
[please reply inline rather than top-posting]
On Thu, Jul 19, 2018 at 5:11 PM Evgeny Cherpak wrote:
> It seems this code placed at the end of the file, after getcommits() does the
> trick:
>
> if {[tk windowingsystem] eq "aqua"} {
> set openscript [format {
> open -a
On Thu, Jul 19, 2018 at 4:39 PM Jeff King wrote:
> [...]
> Let's start by banning strcpy() and sprintf(). It's not
> impossible to use these correctly, but it's easy to do so
> incorrectly, and there's always a better option.
> [...]
> Signed-off-by: Jeff King
> ---
> diff --git a/banned.h
On Thu, Jul 19, 2018 at 2:48 PM Evgeny Cherpak wrote:
> You have probably heard this by now already, but gitk doesn’t work on macOS
> 10.14 - because it uses Apple Events,
> And apps on 10.14 require user to give them permissions to control other apps
> with Apple Events.
This hasn't been
On Wed, Jul 18, 2018 at 6:04 PM Junio C Hamano wrote:
> * es/test-lint-one-shot-export (2018-07-16) 5 commits
> (merged to 'next' on 2018-07-18 at 26a6124963)
> + t/check-non-portable-shell: detect "FOO=bar shell_func"
> + t/check-non-portable-shell: make error messages more compact
> +
On Wed, Jul 18, 2018 at 3:34 PM Stefan Beller wrote:
> On Tue, Jul 17, 2018 at 11:59 AM Eric Sunshine
> wrote:
> > The "git-format-patch --range-diff" option implemented by that patch
> > series (and its upcoming re-roll) place the range-diff before the "--
&g
On Tue, Jul 17, 2018 at 2:53 PM Stefan Beller wrote:
> > A tangent.
> >
> > Because this "-- " is a conventional signature separator, MUAs like
> > Emacs message-mode seems to omit everything below it from the quote
> > while responding, making it cumbersome to comment on the tbdiff.
> >
> >
On Tue, Jul 17, 2018 at 9:51 AM Johannes Schindelin via GitGitGadget
wrote:
> While it is true that we never add unreachable commits into pack files
> intentionally (as `git repack`'s documentation states), we must not
> forget that a `git fetch --prune` (or even a `git fetch` when a ref was
>
On Tue, Jul 17, 2018 at 6:45 AM Johannes Schindelin
wrote:
> On Wed, 30 May 2018, Eric Sunshine wrote:
> > + if (strstr(prev, "..")) {
> > + if (!origin)
> > + die(_("failed to infer range-diff ranges"));
>
:
> On Wed, 30 May 2018, Eric Sunshine wrote:
> > +static int get_range_diff(struct strbuf *sb,
>
> If you rename `sb` to `out`, it makes it more obvious to the casual reader
> that this strbuf will receive the output.
This is gone in the re-roll.
> > + cp.git_cmd = 1;
&g
On Tue, Jul 17, 2018 at 6:15 AM Johannes Schindelin
wrote:
> On Wed, 30 May 2018, Eric Sunshine wrote:
> > make_cover_letter() returns early when it lacks sufficient state to emit
> > a diffstat, which makes it difficult to extend the function to reliably
> > emit additio
On Mon, Jul 16, 2018 at 02:37:32PM -0700, Junio C Hamano wrote:
> Eric Sunshine writes:
> > On Mon, Jul 16, 2018 at 11:51 AM Johannes Schindelin
> > wrote:
> >> On Mon, 16 Jul 2018, Johannes Schindelin wrote:
> >> > > - git
On Mon, Jul 16, 2018 at 5:30 PM Stefan Beller wrote:
> > +test_expect_success 'reduce_heads' '
> > + cat >input <<-\EOF &&
> > + X:commit-1-10
> > + X:commit-2-8
> > + X:commit-3-6
> > + X:commit-4-4
> > + X:commit-1-7
>
On Mon, Jul 16, 2018 at 2:56 PM Jeff King wrote:
> On Mon, Jul 16, 2018 at 02:40:21PM -0400, Eric Sunshine wrote:
> > On Mon, Jul 16, 2018 at 12:18 PM Jeff King wrote:
> > > git-send-email uses the current time minus an offset, and then
> > > monotonically increases fo
On Mon, Jul 16, 2018 at 11:51 AM Johannes Schindelin
wrote:
> On Mon, 16 Jul 2018, Johannes Schindelin wrote:
> > > - git submodule add --force bogus-url submod &&
> > > + git submodule add --force /bogus-url submod &&
> >
> > This breaks on Windows because of the absolute
On Mon, Jul 16, 2018 at 1:27 PM Stefan Beller wrote:
> Another pain point of the Gadget is that CC's in the cover letter
> do not work as I would imagine. The line
>
> CC: sbel...@google.com
>
> did not put that email into the cc field.
gitgitgadget recognizes case-sensitive "Cc:" only[1].
[1]:
On Mon, Jul 16, 2018 at 12:18 PM Jeff King wrote:
> On Mon, Jul 16, 2018 at 02:54:38PM +0100, Ramsay Jones wrote:
> > This is not your problem, but I find these GitGitGadget
> > submissions somewhat annoying. This series has been spewed
> > all over my in-box in, what I assume, is commit date
On Tue, Jul 3, 2018 at 7:26 AM Johannes Schindelin via GitGitGadget
wrote:
> After using this command extensively for the last two months, this
> developer came to the conclusion that even if the dual color mode still
> leaves a lot of room for confusion what was actually changed, the
On Tue, Jul 3, 2018 at 7:27 AM Johannes Schindelin via GitGitGadget
wrote:
> The bulk of this patch consists of a heavily butchered version of
> tbdiff's README written by Thomas Rast and Thomas Gummerer, lifted from
> https://github.com/trast/tbdiff.
>
> Signed-off-by: Johannes Schindelin
> ---
On Tue, Jul 3, 2018 at 7:26 AM Thomas Rast via GitGitGadget
wrote:
> These are essentially lifted from https://github.com/trast/tbdiff, with
> light touch-ups to account for the command now being an option of `git
> branch`.
The "option of `git branch`" mention is outdated. Perhaps just drop
On Tue, Jul 3, 2018 at 7:26 AM Johannes Schindelin via GitGitGadget
wrote:
> This change brings `git range-diff` yet another step closer to
> feature parity with tbdiff: it now shows the oneline, too, and indicates
> with `=` when the commits have identical diffs.
>
> Signed-off-by: Johannes
On Tue, Jul 3, 2018 at 7:27 AM Johannes Schindelin via GitGitGadget
wrote:
> At this stage, `git range-diff` can determine corresponding commits
> of two related commit ranges. This makes use of the recently introduced
> implementation of the Hungarian algorithm.
Did you want
On Fri, Jul 13, 2018 at 12:30 PM Derrick Stolee wrote:
> A recent patch series renamed the get_commit_tree_from_graph method but
> forgot to update the coccinelle script that excempted it from rules
s/excempted/exempted/
> regarding accesses to 'maybe_tree'. This fixes that oversight to bring
>
On Thu, Jul 12, 2018 at 7:52 PM Jeff King wrote:
> (I do agree that being able to automatically catch these with a linter
> would be worth brain cycles, but I cannot immediately think a of a way
> to do so).
Perhaps something like this[1]?
[1]:
e, so drop "please" to make the message a
bit more concise.
Signed-off-by: Eric Sunshine
---
t/check-non-portable-shell.pl | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
index e07f028437..11028
r multiple lines:
FOO=bar BAR=foo \
shell_func
Signed-off-by: Eric Sunshine
---
t/check-non-portable-shell.pl | 19 +++
1 file changed, 19 insertions(+)
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
index f6dbe28b19..d5823f71d8 100755
--- a
by a good deal of empty
space. This can make for a difficult read, especially on typical
80-column terminals.
Make the messages more compact and perhaps a bit easier to digest by
folding out the leading whitespace from .
Signed-off-by: Eric Sunshine
---
t/check-non-portable-shell.pl | 2 ++
1 file
ver, the usage is
nevertheless misleading and poor practice, so fix the tests to assign
and export the environment variables in the usual fashion.
Signed-off-by: Eric Sunshine
---
t/t6046-merge-skip-unneeded-updates.sh | 4 +++-
t/t9833-errors.sh | 4 +++-
2 files changed
ot-export-fix'[1].
[1]: https://public-inbox.org/git/xmqqefg8w73c@gitster-ct.c.googlers.com/T/
Eric Sunshine (4):
t6046/t9833: fix use of "VAR=VAL cmd" with a shell function
t/check-non-portable-shell: stop being so polite
t/check-non-portable-shell: make error messages more comp
On Thu, Jul 12, 2018 at 3:40 PM Derrick Stolee wrote:
> In anticipation of writing multi-pack-indexes, add a skeleton
> 'git multi-pack-index write' subcommand and send the options to a
> write_midx_file() method. Also create a skeleton test script that
> tests the 'write' subcommand.
>
>
On Thu, Jul 12, 2018 at 4:13 PM Junio C Hamano wrote:
> I _think_ the right and safe way to fix taht is to do something like
> this:
>
> test -f .git/rebase-merge/author-script &&
> (
> safe_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL ... &&
s/safe_unset/sane_unset/
>
On Thu, Jul 12, 2018 at 12:56 PM Jeff King wrote:
> Like Junio, I'm a little nervous that this is going to end up being a
> maintenance burden. People may hit false positives and then be
> confronted with this horrible mass of sed to try to figure out what went
> wrong [...]
A very valid
On Thu, Jul 12, 2018 at 2:50 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > The exact reason is that the prerequisite was not met (indeed, I
> > wasn't even aware of that prerequisite), so the commit message can be
> > more direct:
> >
> > This was mis
On Thu, Jul 12, 2018 at 2:35 PM Junio C Hamano wrote:
> Junio C Hamano writes:
> Oops, sent before completing the message.
>
> For that to happen, we need a sign-off ;-)
>
> I guess this one would have been caught with the "sed script on
> subshell" linter that does not execute?
Yes,
On Thu, Jul 12, 2018 at 10:10 AM Derrick Stolee wrote:
> On 7/6/2018 12:36 AM, Eric Sunshine wrote:
> > There seems to be a fair bit of duplication in these tests which
> > create objects. Is it possible to factor out some of this code into a
> > shell function?
>
> In
On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor wrote:
> The change below should be squashed into this patch to fix a
> previously unnoticed broken &&-chain. I think you missed it, because
> this test script is rather expensive and you didn't run it with
> GIT_TEST_CLONE_2GB=YesPlease.
>
> diff
On Wed, Jul 11, 2018 at 5:37 PM Junio C Hamano wrote:
> As with the previous "transform the script and feed the result to
> shell" approach, this risks to force us into writing our tests in a
> subset of valid shell language, which is the primary reason why I
> was not enthused when I saw the
301 - 400 of 3596 matches
Mail list logo
