Hi Junio,
On Tue, 4 Sep 2018, Junio C Hamano wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > index 84bf598c3e..ac5c805c14 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -3578,9 +3578,20 @@ static int commit_staged_changes(struct replay_opts
> > *opts,
> > * the
Hi Eric,
On Tue, 4 Sep 2018, Eric Sunshine wrote:
> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
> wrote:
> > So let's do something different in VSTS: let's run all the tests with
> > `--quiet` first, and only if a failure is encountered, try to trac
Hi Eric,
On Mon, 3 Sep 2018, Eric Sunshine wrote:
> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
> wrote:
> > The upcoming patches will allow building git.git via VSTS CI, where
> > variable names and URLs look a bit different than in Travis CI.
Hi Eric,
On Mon, 3 Sep 2018, Eric Sunshine wrote:
> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
> wrote:
> > This will come in handy when publishing the results of Git's test suite
> > during an automated VSTS CI run.
> >
> > Sign
From: Johannes Schindelin
Sometimes, failures in a test case are actually caused by issues in
earlier test cases.
To make it easier to see those issues, let's attach the output from
before the failing test case (i.e. stdout/stderr since the previous
failing test case, or the start of the test
From: Johannes Schindelin
In the next commit, we want to teach Git's test suite to optionally
output test results in JUnit-style .xml files. These files contain
information about the time spent. So we need a way to measure time.
While we could use `date +%s` for that, this will give us only
From: Johannes Schindelin
Just like so many other OSS projects, we now also have a build badge.
Signed-off-by: Johannes Schindelin
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index f920a42fad..f260e78042 100644
--- a/README.md
+++ b/README.md
From: Johannes Schindelin
The upcoming patches will allow building git.git via VSTS CI, where
variable names and URLs look a bit different than in Travis CI.
Signed-off-by: Johannes Schindelin
---
ci/install-dependencies.sh | 3 ++-
ci/lib.sh | 44
From: Johannes Schindelin
The JUnit XML format lends itself to be presented in a powerful UI,
where you can drill down to the information you are interested in very
quickly.
For test failures, this usually means that you want to see the detailed
trace of the failing tests.
With Travis CI, we
From: Johannes Schindelin
This commit adds a .vsts-ci.yml which is Visual Studio Team Services'
equivalent to Travis CI's .travis.yml.
To make things a bit easier to understand, we refrain from using the
`matrix` feature here because (while it is powerful) it can be a bit
confusing to users who
From: Johannes Schindelin
This will come in handy when publishing the results of Git's test suite
during an automated VSTS CI run.
Signed-off-by: Johannes Schindelin
---
t/.gitignore | 1 +
t/test-lib.sh | 98 +++
2 files changed, 99
From: Johannes Schindelin
The name is hard-coded to reflect that we use Travis CI for continuous
testing.
In the next commits, we will extend this to be able use Visual Studio
Team Services, too.
So let's adjust the name to make it more generic.
Signed-off-by: Johannes Schindelin
---
ci
From: Johannes Schindelin
This patch introduces a conditional arm that defines some environment
variables and a function that displays the URL given the job id (to
identify previous runs for known-good trees).
Signed-off-by: Johannes Schindelin
---
ci/lib.sh | 23 +++
1
ase let me know what you think about this.
Johannes Schindelin (9):
ci: rename the library of common functions
ci/lib.sh: encapsulate Travis-specific things
test-date: add a subcommand to measure times in shell scripts
tests: optionally write results as JUnit-style .xml
ci/lib.sh: add suppor
Hi Eric,
On Mon, 3 Sep 2018, Eric Sunshine wrote:
> On Mon, Sep 3, 2018 at 2:44 PM Johannes Schindelin
> wrote:
> > where `strbuf_join_argv()` would be implemented like this (and I would put
> > it into strbuf.c and strbuf.h:
> >
> > const char *strbu
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> This a new iteration of `stash.c`.
Thank you for the pleasant read!
I read through all of the patches, spending particularly some time with
the `stash create` one.
Apart from the few comments I had, I only have positive things to
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> This commit replaces spawning `git write-tree` with API calls.
>
> Signed-off-by: Paul-Sebastian Ungureanu
> ---
> builtin/stash.c | 41 -
> 1 file changed, 12 insertions(+), 29
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> This commits introduces a optimization by avoiding calling the
> same functions again. For example, `git stash push -u`
> would call at some points the following functions:
>
> * `check_changes()` (inside `do_push_stash()`)
> *
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> Add stash save to the helper and delete functions which are no
> longer needed (`show_help()`, `save_stash()`, `push_stash()`,
> `create_stash()`, `clear_stash()`, `untracked_files()` and
> `no_changes()`).
>
> The `-m` option is
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 87568b0f34..ce360a569d 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -290,6 +296,18 @@ static int reset_head(void)
> return
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash.c
> similarity index 90%
> rename from builtin/stash--helper.c
> rename to builtin/stash.c
> index 1269f2548c..3d2316e3f7 100644
> --- a/builtin/stash--helper.c
> +++
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index ce360a569d..23670321d8 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -1204,6 +1214,223 @@ static int create_stash(int argc, const
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index cbe23fef11..dadc028649 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -535,6 +541,42 @@ static int drop_stash(int argc, const char
Hi Paul,
On Fri, 31 Aug 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 02b593e0cd..87568b0f34 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -723,6 +728,54 @@ static int show_stash(int argc, const char
Hi Junio,
On Thu, 30 Aug 2018, Junio C Hamano wrote:
> Paul-Sebastian Ungureanu writes:
> > +test_stat_and_patch () {
> > + if test "" = "$1"
> > + then
> > + test_might_fail git config --unset stash.showStat
> > + else
> > + test_config stash.showStat "$1"
> > + fi
chain,
that information would be reused!
This patch pair first introduces the test case to confirm the breakage, and
then fixes it in the minimal way.
Johannes Schindelin (2):
rebase -i --autosquash: demonstrate a problem skipping the last squash
rebase -i: be careful to wrap up fixup/squash
From: Johannes Schindelin
When an interactive rebase was stopped at the end of a fixup/squash
chain, the user might have edited the commit manually before continuing
(with either `git rebase --skip` or `git rebase --continue`, it does not
really matter which).
We need to be very careful to wrap
From: Johannes Schindelin
The `git commit --squash` command can be used not only to amend commit
messages and changes, but also to record notes for an upcoming rebase.
For example, when the author information of a given commit is incorrect,
a user might call `git commit --allow-empty -m &quo
Hi,
On Thu, 30 Aug 2018, Stefan Beller wrote:
> On Thu, Aug 30, 2018 at 12:20 PM Jeff King wrote:
> >
> > [...] Myers does not promise to find the absolute minimal diff. [...]
>
> The `Myers` (our default) diff algorithm is really the Myers algorithm +
> a heuristic that cuts off the long tail
Hi Junio,
On Fri, 31 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Would "echo base >base" give us 5-byte long base even on Windows?
> >
> > Please note that Unix shell scripting is a foreign thing on Windows. As
> > such,
Hi Peff,
On Thu, 30 Aug 2018, Jeff King wrote:
> On Thu, Aug 30, 2018 at 01:03:41PM +0200, Johannes Schindelin wrote:
>
> > > Will replace by doing:
> > >
> > > $ git checkout js/rebase-in-c-5.5-work-with-rebase-i-in-c
> > > $ git
Hi Elijah,
On Thu, 30 Aug 2018, Elijah Newren wrote:
> On Tue, Aug 28, 2018 at 9:58 AM Junio C Hamano wrote:
> >
> > Elijah Newren writes:
> >
> > > - Add a flag to turn off directory rename detection, and set the
> > > flag for every call from am.c in order to avoid problems like this.
> >
Hi Junio,
On Thu, 30 Aug 2018, Junio C Hamano wrote:
> Jeff King writes:
>
> > +test_expect_success \
> > +'apply delta with too many copied bytes' \
> > +'printf "\5\1\221\0\2" > too_big_copy &&
> > + echo base >base &&
> > + test_must_fail test-tool delta -p base too_big_copy
Hi Ævar,
On Thu, 30 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
> On Thu, Aug 30 2018, Johannes Schindelin wrote:
>
> > On Wed, 29 Aug 2018, Junio C Hamano wrote:
> >
> >> Johannes Schindelin writes:
> >>
> >> > The `stash` command o
Hi Junio,
On Wed, 29 Aug 2018, Junio C Hamano wrote:
> * es/format-patch-interdiff (2018-07-23) 6 commits
> - format-patch: allow --interdiff to apply to a lone-patch
> - log-tree: show_log: make commentary block delimiting reusable
> - interdiff: teach show_interdiff() to indent interdiff
>
Hi Junio,
On Wed, 29 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The `stash` command only incidentally requires that the author is set, as
> > it calls `git commit` internally (which records the author). As stashes
> > are intended to be
Hi Peff,
On Wed, 29 Aug 2018, Jeff King wrote:
> - it naturally limits the candidate pool to under-represented groups
> (which is the whole point of the program, but if you don't
> actually care about that, then it's just a complication)
>
> So IMHO it's easily worth the trouble.
I
Hi Peff,
On Wed, 29 Aug 2018, Jeff King wrote:
> On Wed, Aug 29, 2018 at 04:46:29PM +0200, Johannes Schindelin wrote:
>
> > On Wed, 29 Aug 2018, Jeff King wrote:
> >
> > > On Mon, Aug 27, 2018 at 03:34:16PM +0200, Johannes Schindelin wrote:
> > >
> >
Hi Piers,
On Thu, 30 Aug 2018, Piers Titus van der Torren wrote:
> I've created a diff algorithm that focuses on creating readable diffs,
> see https://github.com/pierstitus/klondiff
Looks intriguing.
> The git integration as an external diff command works quite well,
> though it would be nice
Hi Junio,
On Wed, 29 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The builtin rebase and the builtin interactive rebase have been
> > developed independently, on purpose: G
Hi Ulrich,
On Tue, 28 Aug 2018, Ulrich Gemkow wrote:
> A trivial enhancement request:
>
> All commands which require that the author is set (and complain if
> it is not set) should accept the option --author.
>
> At least the command stash does not accept this option. We are using
> git
your continued support.
>
> Aaron Schrab, Ævar Arnfjörð Bjarmason, Alban Gruin, Alejandro
> R. Sedeño, Anthony Sottile, Antonio Ospite, Beat Bolli, Ben
> Peart, Brandon Williams, brian m. carlson, Christian Couder,
> Derrick Stolee, Elia Pinto, Elijah Newren, Eric Sunshine,
>
Hi Peff,
On Wed, 29 Aug 2018, Jeff King wrote:
> On Mon, Aug 27, 2018 at 03:34:16PM +0200, Johannes Schindelin wrote:
>
> > Rather than have a "hack day", I would actually prefer to work with
> > other contributors in a way that we have not done before, but which I
&
Hi Peff,
On Wed, 29 Aug 2018, Jeff King wrote:
> On Mon, Aug 27, 2018 at 03:22:39PM +0200, Johannes Schindelin wrote:
>
> > Having said that, I believe that we core contributors can learn to have a
> > fruitful online meeting. With 30+ participants, too.
> >
> &
Hi Jonathan,
On Tue, 28 Aug 2018, Jonathan Nieder wrote:
> [... talking about the IRC channel ...]
>
> My offer to +v anyone affected by the channel's current settings still
> stands (just /msg me). Zero people have taken me up on this offer so
> far.
I did have problems seeing any private
From: Johannes Schindelin
The builtin rebase and the builtin interactive rebase have been
developed independently, on purpose: Google Summer of Code rules
specifically state that students have to work on independent projects,
they cannot collaborate on the same project.
One fallout
fault to
using the builtin rebase".
Changes since v1:
* replaced the too-terse commit message by a copy-edited version of this
cover letter (leaving out only the rant about disallowing teamwork).
Johannes Schindelin (1):
builtin rebase: prepare for builtin rebase -i
builtin/reb
Hi Jonathan,
On Tue, 28 Aug 2018, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
> > On Mon, 27 Aug 2018, Junio C Hamano wrote:
> >> Johannes Schindelin writes:
> >>> Jonathan Nieder wrote:
>
> >>>> Please include this information in the co
Hi Junio,
On Tue, 28 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I do recall discouraging you from including irrelevant rant/whine in
> >> the log message a few times in the recent past, and also I do recall
> >> you never listenin
Hi Jonathan,
On Tue, 28 Aug 2018, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
> > On Thu, 23 Aug 2018, Jonathan Nieder wrote:
> > > Ævar Arnfjörð Bjarmason wrote:
>
> >>> Are we going to need a midx version of these mapping files? How does
> >>
Hi Elijah,
On Wed, 29 Aug 2018, Elijah Newren wrote:
> Signed-off-by: Elijah Newren
> ---
> merge-recursive.c | 18 +-
> merge-recursive.h | 1 +
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index
Hi Elijah,
On Wed, 29 Aug 2018, Elijah Newren wrote:
> Let's say you have the following three trees, where Base is from one commit
> behind either master or branch:
>
>Base : bar_v1, foo/{file1, file2, file3}
>branch: bar_v2, foo/{file1, file2}, goo/file3
>master: bar_v3,
Hi,
On Tue, 28 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Aug 28 2018, Nikolay Kasyanov wrote:
>
> > I’ve found something that may be a regression in git rebase implementation
> > in 2.18.0.
> > First I spotted it on macOS but I can also confirm it happening on Linux.
> > Git
Hi Tiago,
On Tue, 28 Aug 2018, Tiago Botelho wrote:
> This will enable users to implement bisecting on first parents
> which can be useful for when the commits from a feature branch
> that we want to merge are not always tested.
This message is still lacking the explanation I asked for, namely
Hi Junio,
On Mon, 27 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Please include this information in the commit message. It's super
> >> helpful to find this kind of information about why a patch does what
> >> it does when encoun
Hi Peff,
On Mon, 27 Aug 2018, Jeff King wrote:
> On Mon, Aug 27, 2018 at 06:25:26PM +0200, Johannes Schindelin wrote:
>
> > On Sat, 25 Aug 2018, Jeff King wrote:
> >
> > > On Wed, Aug 22, 2018 at 04:16:00PM -0700, Gregory Oschwald wrote:
> > >
> >
Hi Stolee,
On Mon, 27 Aug 2018, Derrick Stolee wrote:
> On 8/27/2018 9:22 AM, Johannes Schindelin wrote:
> > Point in favor of the pure-online meeting: the informal standup on IRC
> > every second Friday. I really try to attend it (it is a bit awkward
> > because it is on a
Hi,
On Thu, 23 Aug 2018, Jonathan Nieder wrote:
> Ævar Arnfjörð Bjarmason wrote:
>
> [...]
> >> Since all operations that make new objects (e.g., "git commit") add
> >> the new objects to the corresponding index, this mapping is possible
> >> for all objects in the object store.
> >
> > Are we
Hi AEvar,
On Mon, 13 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
> * Re the second half of "Not everyone can travel or can afford to do
>so" from Derrick, there's been travel sponsorships in past years.
Just to make sure that you understand: there are many more reasons than
just travel costs
Hi,
On Mon, 6 Aug 2018, Eric Sunshine wrote:
> On Mon, Aug 6, 2018 at 9:20 PM Hilco Wijbenga
> wrote:
> > But your suggestion did make me think about what behaviour I would
> > like to see, exactly. I like that Git removes commits that no longer
> > serve any purpose (because I've included
Hi,
On Sat, 25 Aug 2018, Constantin Weißer wrote:
> I think there are two aspects to using "force with lease".
There is a third, very, very important aspect.
When you use --force-with-lease (and I, for one, do, all the time), keep
in mind that it assumes that you are at least aware of the
Hi Peff,
On Sat, 25 Aug 2018, Jeff King wrote:
> On Wed, Aug 22, 2018 at 04:16:00PM -0700, Gregory Oschwald wrote:
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 3bfeabc463..3670024a25 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1440,6 +1440,7 @@ int
nshine
> > 11 Helped-by: Junio C Hamano
> >9 Helped-by: Jeff King
> >8 Reviewed-by: Elijah Newren
> >7 Reported-by: Ramsay Jones
> >7 Acked-by: Johannes Schindelin
> >7 Acked-by: Brandon Willi
Hi Junio,
On Tue, 14 Aug 2018, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Tue, Aug 14, 2018 at 01:43:38PM -0400, Derrick Stolee wrote:
> >
> >> On 8/13/2018 5:54 PM, Jeff King wrote:
> >> > So I try not to think too hard on metrics, and just use them to get a
> >> > rough view on who
Hi Eric,
I would like to take five minutes to thank you for public-inbox. It is
invaluable for me in the meantime. And I think I will never be able to
thank you enough for it.
Just a couple of things where it is super useful to me:
- Recently, my mail provider started dropping mails left and
Hi Peff,
On Mon, 13 Aug 2018, Jeff King wrote:
> For the past several years, we've held a Git Contributor Summit as part
> of the Git Merge conference. I'd like to get opinions from the community
> to help plan future installments. Any feedback or opinion is welcome,
> but some obvious things to
Hi Peff & everybody,
On Mon, 13 Aug 2018, Jeff King wrote:
> On Mon, Aug 13, 2018 at 12:58:54PM -0400, Derrick Stolee wrote:
>
> > I would be up for two meetings a year. I would expect that the variety of
> > locations would allow a larger set of contributors to make at least one
> > meeting a
Hi,
On Thu, 16 Aug 2018, Junio C Hamano wrote:
> Phillip Wood writes:
>
> > This commit implements a minimal fix which fixes the crash and allows
> > the user to successfully commit a conflict resolution with 'git rebase
> > --continue'. It does not write .git/rebase-merge/patch,
> >
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Stefan Beller writes:
>
> > On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
> >>
> >> This commit introduces a rebase option `--quiet`. While `--quiet` is
> >> commonly perceived as opposite to `--verbose`, this is not the case for
> >>
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > This commit converts the equivalent part of the shell script
> > `git-legacy-rebase.sh` to run the pre-rebase hook (unless disabled), and
> > to interrupt the rebase with error if the hook fails.
> >
> >
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > This commit implements support for an --onto argument that is actually a
> > "symmetric range" i.e. `...`.
> >
> > The equivalent shell script version of the code offers two different
> > error messages for the
Hi Bryan,
On Fri, 24 Aug 2018, Bryan Turner wrote:
> On Fri, Aug 24, 2018 at 5:14 AM Johannes Schindelin
> wrote:
> >
> > For that reason, I was delighted to see that our Google Summer of Code
> > pushed pretty hard in that direction. And I could not help myself so I
Hi Jonathan,
On Wed, 22 Aug 2018, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
>
> [nice description snipped]
> > This patch fixes that.
>
> Please include this information in the commit message. It's super
> helpful to find this kind of information abo
Team,
On Fri, 24 Aug 2018, Johannes Schindelin wrote:
> while this mail talks about Git for Windows, please keep in mind that we
> try *very* hard to keep Git for Windows' master working correctly not only
> on Windows but also on macOS and Linux.
>
> I, for one, run Git
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > The `--onto` option is important, as it allows to rebase a range of
> > commits onto a different base commit (which gave the command its odd
> > name: "rebase").
>
> Is there anything unimportant? A rhetorical
Hi Stefan,
On Wed, 8 Aug 2018, Stefan Beller wrote:
> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
> >
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 8a7bf3d468..a261f552f1 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > @@ -455,6 +481,26 @@ int
Hi Stefan,
On Wed, 8 Aug 2018, Stefan Beller wrote:
> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
>
> > @@ -551,10 +560,21 @@ int cmd_rebase(int argc, const char **argv, const
> > char *prefix)
> [...]
> > ; /* be quiet */
> > else if
Hi Duy,
On Sat, 18 Aug 2018, Duy Nguyen wrote:
> On Wed, Aug 8, 2018 at 5:26 PM Pratik Karki wrote:
> > @@ -224,13 +219,56 @@ static int read_basic_state(struct rebase_options
> > *opts)
> > return 0;
> > }
> >
> > +static int apply_autostash(struct rebase_options *opts)
> > +{
> > +
Hi,
On Wed, 8 Aug 2018, Pratik Karki wrote:
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 42ee040da3..fd9ad8efae 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -588,6 +607,8 @@ int cmd_rebase(int argc, const char **argv, const char
> *prefix)
>
Team,
while this mail talks about Git for Windows, please keep in mind that we
try *very* hard to keep Git for Windows' master working correctly not only
on Windows but also on macOS and Linux.
I, for one, run Git built from Git for Windows' `master` branch in my
Linux VMs all the time.
As all
Hi Junio,
On Thu, 23 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Wed, 22 Aug 2018, Kyle Meyer wrote:
> >
> >> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
> >> replaced --dual-color with --no-dual-colo
Hi Phillip,
On Fri, 17 Aug 2018, Phillip Wood wrote:
> On 10/08/2018 17:51, Alban Gruin wrote:
>
> > +{
> > + const char *quiet = getenv("GIT_QUIET");
> > +
> > + if (head_name)
> > + write_file(rebase_path_head_name(), "%s\n", head_name);
>
> write_file() can call die() which
Hi Junio,
On Wed, 22 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > I made this same mistake over and over again, myself. For some reason,
> > John Keeping decided to use the singular form "revision" in 1e0dacdbdb75
> > (rebase: omit p
Hi Ævar,
On Thu, 23 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
>
> On Thu, Aug 23 2018, Johannes Schindelin via GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > A recently-added test case tries to verify that the output of `checkout
> > -p` c
Hi Kyle,
On Wed, 22 Aug 2018, Kyle Meyer wrote:
> 275267937b (range-diff: make dual-color the default mode, 2018-08-13)
> replaced --dual-color with --no-dual-color but left the option's
> summary untouched. Rewrite the summary to describe --no-dual-color
> rather than dual-color.
>
>
Hi Gábor,
On Thu, 23 Aug 2018, SZEDER Gábor wrote:
> The verbose output of the test 'reword without issues functions as
> intended' in 't3423-rebase-reword.sh', added in a9279c6785 (sequencer:
> do not squash 'reword' commits when we hit conflicts, 2018-06-19),
> contains the following error
list due to
https://github.com/gitgitgadget/gitgitgadget/issues/29):
* reworded the commit message slightly.
Johannes Schindelin (1):
t2024: mark a `checkout -p` test as requiring Perl
t/t2024-checkout-dwim.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
base-co
From: Johannes Schindelin
A recently-added test case tries to verify that the output of `checkout
-p` contains a certain piece of advice.
But if Git was built without Perl and therefore lacks support for `git
add -i`, the error output contains the hint that `-p` is not even
available instead
Hi Jonathan,
On Wed, 22 Aug 2018, Jonathan Nieder wrote:
> OPT_INTEGER(0, "creation-factor", _factor,
> N_("Percentage by which creation is weighted")),
> - OPT_BOOL(0, "no-dual-color", _color,
> - N_("color both diff
Hi Junio,
On Wed, 22 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > FWIW I am a lot more bold about these builtins, and want to get them
> > into Git for Windows v2.19.0, either as full replacements, or like I
> > did with the difftool: by offer
Hi Stefan,
On Wed, 22 Aug 2018, Stefan Beller wrote:
> Instead of passing the sign directly to emit_line_ws_markup, pass only the
> index to lookup the sign in diff_options->output_indicators.
>
> Signed-off-by: Stefan Beller
Looks good to me!
> ---
> diff.c | 12 +---
> 1 file
Hi Junio,
On Wed, 22 Aug 2018, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > 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 in any
From: Johannes Schindelin
It is no longer a shell script, so we need to call it in a different way
than the other backends.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 81
1 file changed, 81 insertions(+)
diff --git a/builtin
fault to
using the builtin rebase".
Johannes Schindelin (1):
builtin rebase: prepare for builtin rebase -i
builtin/rebase.c | 81
1 file changed, 81 insertions(+)
base-commit: a5bb2345d2d414aba04e18531de1e0f041f0434a
Published-As:
https://
Hi Alban,
thank you for your tireless work on this!
One thing that needs to be fixed, though:
On Fri, 10 Aug 2018, Alban Gruin wrote:
> +run_interactive () {
> + GIT_CHERRY_PICK_HELP="$resolvemsg"
> + export GIT_CHERRY_PICK_HELP
> +
> + test -n "$keep_empty" &&
Hi Stefan,
On Mon, 20 Aug 2018, Stefan Beller wrote:
> On Mon, Aug 20, 2018 at 12:31 PM Johannes Schindelin
> wrote:
> >
> > On Fri, 17 Aug 2018, Stefan Beller wrote:
> >
> > > This will prove useful in range-diff in a later patch as we will be able
> >
Team,
On Mon, 20 Aug 2018, Phillip Wood wrote:
> On 17/08/2018 23:44, Junio C Hamano wrote:
> > 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
Hi Stefan,
On Fri, 17 Aug 2018, Stefan Beller wrote:
> This will prove useful in range-diff in a later patch as we will be able
> to differentiate between adding a new file (that line is starting with
> +++ and then the file name) and regular new lines.
>
> It could also be useful for
Hi,
On Wed, 15 Aug 2018, Junio C Hamano wrote:
> Phillip Wood writes:
>
> >> I wonder if it makes it easier to read, understand and maintain if
> >> there were a local variable that gets opts->current_fixup_count+2 at
> >> the beginning of the function, make these three places refer to that
>
Hi Phillip,
On Wed, 15 Aug 2018, Phillip Wood wrote:
> From: Phillip Wood
>
> If a merge command in the todo list specifies just a branch to merge
> with no -C/-c argument then item->commit is NULL. This means that if
> there are merge conflicts error_with_patch() is passed a NULL commit
>
401 - 500 of 5954 matches
Mail list logo
