Hi Gábor,
On Tue, 16 Oct 2018, SZEDER Gábor wrote:
> On Mon, Oct 15, 2018 at 03:12:12AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > The JUnit XML format lends itself to be presented in a powerful UI,
>
Hi Gábor,
On Tue, 16 Oct 2018, SZEDER Gábor wrote:
> On Mon, Oct 15, 2018 at 03:12:05AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > This patch introduces a conditional arm that defines some environment
> > variable
Hi Junio,
On Tue, 16 Oct 2018, SZEDER Gábor wrote:
> On Mon, Oct 15, 2018 at 03:12:17AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > When building a PR, TRAVIS_BRANCH refers to the *target branch*.
> > Ther
Hi Eric,
On Mon, 15 Oct 2018, Eric Sunshine wrote:
> On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget
> wrote:
> > We do have the excellent GetUserInfoEx() function to obtain more
> > detailed information of the current user (if the user is part of a
Hi Eric,
On Mon, 15 Oct 2018, Eric Sunshine wrote:
> On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget
> wrote:
> > When a user is registered in a Windows domain, it is really easy to
> > obtain the email address. So let's do that.
> > [...]
>
Hi Peff,
On Tue, 16 Oct 2018, Jeff King wrote:
> On Tue, Oct 16, 2018 at 01:23:25PM +0900, Junio C Hamano wrote:
>
> > > +#if LIBCURL_VERSION_NUM >= 0x072c00
> > > + curl_easy_setopt(result, CURLOPT_SSL_OPTIONS,
> > > CURLSSLOPT_NO_REVOKE);
> > > +#else
> > > +
Hi Junio,
On Tue, 16 Oct 2018, Junio C Hamano wrote:
> "Brendan Forster via GitGitGadget" writes:
>
> > Note: an earlier iteration tried to use the config setting
> > http.schannel.checkRevoke, but the http.* config settings can be limited
> > to specific URLs via http..* (which would mistake
Hi Eric,
On Mon, 15 Oct 2018, Eric Sunshine wrote:
> On Mon, Oct 15, 2018 at 6:14 AM Brendan Forster via GitGitGadget
> wrote:
> > This config value is only used if http.sslBackend is set to "schannel",
> > which forces cURL to use the Windows Certificate Store when validating
> > server
Hi Thomas,
On Mon, 15 Oct 2018, Thomas Gummerer wrote:
> 2: 63f2e0e6f9 ! 2: 2d45985676 strbuf.c: add `strbuf_join_argv()`
> @@ -14,19 +14,17 @@
> strbuf_setlen(sb, sb->len + sb2->len);
> }
>
> -+const char *strbuf_join_argv(struct strbuf *buf,
> -+
Hi Junio,
On Tue, 16 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > Also, we make use of the shiny new feature we just introduced where the
> > test suite can output JUnit-style .xml files. This information is
Hi Luke,
On Mon, 15 Oct 2018, Luke Diamand wrote:
> On Mon, 15 Oct 2018 at 16:02, Johannes Schindelin
> wrote:
> >
> > Hi Luke,
> >
> > On Mon, 15 Oct 2018, Luke Diamand wrote:
> >
> > > On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via Gi
Hi Eric,
On Mon, 15 Oct 2018, Eric Sunshine wrote:
> On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget
> wrote:
> > This should be more reliable than the current method, and prepares the
> > test suite for a consistent way to clean up before re
Hi Eric,
On Mon, 15 Oct 2018, Eric Sunshine wrote:
> On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget
> wrote:
> > Just like so many other OSS projects, we now also have a build badge.
> >
> > Signed-off-by: Johannes Schindelin
> > --
Hi team,
On Mon, 15 Oct 2018, Christian Couder wrote:
> On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote:
> >
> > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason
> > wrote:
> > > As an aside I poked Junio via private mail in late August to see if he'd
> > > be interested in pushing to
Hi Luke,
On Mon, 15 Oct 2018, Luke Diamand wrote:
> On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via GitGitGadget
> wrote:
> >
> > From: Johannes Schindelin
> >
> > This should be more reliable than the current method, and prepares the
> > test su
of the last revision.
>
> On Mon, Oct 15, 2018 at 03:11:57AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > It is also an invaluable tool for contributors who can validate their code
> > contributions via PRs on GitHub, e.g. to verify that their tests do actually
&g
From: Johannes Schindelin
As of cURL v7.60.0, the Secure Channel backend can use the certificate
bundle provided via `http.sslCAInfo`, but that would override the
Windows Certificate Store. Since this is not desirable by default, let's
tell Git to not ask cURL to use that bundle by default when
From: Johannes Schindelin
As of version 7.56.0, curl supports being compiled with multiple SSL
backends.
This patch adds the Git side of that feature: by setting http.sslBackend
to "openssl" or "schannel", Git for Windows can now choose the SSL
backend at runtime.
checks in cURL
Johannes Schindelin (2):
http: add support for selecting SSL backends at runtime
http: when using Secure Channel, ignore sslCAInfo by default
Documentation/config.txt | 21
http.c | 71 +++-
2 files changed, 91
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
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..bf4780c22d 100644
--- a/README.md
+++ b/README.md
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
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
When building a PR, TRAVIS_BRANCH refers to the *target branch*.
Therefore, if a PR targets `master`, and `master` happened to be tagged,
we skipped the build by mistake.
Fix this by using TRAVIS_PULL_REQUEST_BRANCH (i.e. the *source branch*)
when available, falling
The shell scripted parts now use proper && chains.
Johannes Schindelin (13):
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/l
From: Johannes Schindelin
When running the p4 daemon or `git daemon`, we want to kill it at the
end of the test script.
So far, we do this "manually".
However, in the next few commits we want to teach the test suite to
optionally re-run scripts with different options, therefore we
From: Johannes Schindelin
This commit adds an azure-pipelines.yml file which is Azure DevOps'
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 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
From: Johannes Schindelin
This should be more reliable than the current method, and prepares the
test suite for a consistent way to clean up before re-running the tests
with different options.
Signed-off-by: Johannes Schindelin
---
t/lib-git-p4.sh| 10 +-
t
From: Johannes Schindelin
This will come in handy when publishing the results of Git's test suite
during an automated Azure DevOps 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 Azure DevOps,
too.
So let's adjust the name to make it more generic.
Signed-off-by: Johannes Schindelin
---
ci/install
From: Johannes Schindelin
This makes use of the just-introduced consistent way to specify that a
long-running process needs to be terminated at the end of a test script
run.
Signed-off-by: Johannes Schindelin
---
t/interop/i5500-git-daemon.sh | 1 -
t/lib-git-daemon.sh | 3 +--
t
From: Johannes Schindelin
The upcoming patches will allow building git.git via Azure Pipelines
(i.e. Azure DevOps' Continuous Integration), where variable names and
URLs look a bit different than in Travis CI.
Signed-off-by: Johannes Schindelin
---
ci/install-dependencies.sh | 3 ++-
ci
From: Johannes Schindelin
When a user is registered in a Windows domain, it is really easy to
obtain the email address. So let's do that.
Suggested by Lutz Roeder.
Signed-off-by: Johannes Schindelin
---
compat/mingw.c| 5 +
compat/mingw.h| 2 ++
git-compat-util.h | 4
From: Johannes Schindelin
We do have the excellent GetUserInfoEx() function to obtain more
detailed information of the current user (if the user is part of a
Windows domain); Let's use it.
Suggested by Lutz Roeder.
To avoid the cost of loading Secur32.dll (even lazily, loading DLLs
takes a non
On Linux, we use the gecos information to come up with a sensible user
name/email. On Windows, there is no gecos. But there is something
comparable, and with these patches, we use it.
This has been carried in Git for Windows for three years, and is considered
mature.
Johannes Schindelin (3
From: Johannes Schindelin
Signed-off-by: Johannes Schindelin
---
compat/mingw.c | 25 ++---
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 18caf21969..597781b370 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
Hi Paul,
On Mon, 15 Oct 2018, Paul-Sebastian Ungureanu wrote:
> +static void assert_stash_like(struct stash_info *info, const char *revision)
> +{
> + if (get_oidf(>b_commit, "%s^1", revision) ||
> + get_oidf(>w_tree, "%s:", revision) ||
> + get_oidf(>b_tree, "%s^1:",
Hi Stolee,
On Fri, 12 Oct 2018, Derrick Stolee wrote:
>
> In an effort to ensure new code is reasonably covered by the test suite, we
> now have contrib/coverage-diff.sh to combine the gcov output from 'make
> coverage-test ; make coverage-report' with the output from 'git diff A B' to
>
Hi Junio,
On Fri, 12 Oct 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Hi Junio,
> >
> > On Fri, 12 Oct 2018, Junio C Hamano wrote:
> >
> >> From: Martin Koegler
> >> Date: Thu, 10 Aug 2017 20:13:08 +0200
> >>
> &
Hi Junio,
On Fri, 12 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > This patch introduces that, based on ag/rebase-i-in-c.
> >
> > Changes since v2:
> >
> > * Fixed two typos.
> > * When inter
Hi Junio,
On Fri, 12 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > @@ -3293,6 +3312,9 @@ static int pick_commits(struct todo_list *todo_list,
> > struct replay_opts *opts)
> >
From: Johannes Schindelin
We had not documented previously what happens when an `exec` command in
an interactive rebase fails. Now we do.
Signed-off-by: Johannes Schindelin
---
Documentation/git-rebase.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
unshineco.com [sunsh...@sunshineco.com]
Johannes Schindelin (2):
rebase -i: clarify what happens on a failed `exec`
rebase -i: introduce the 'break' command
Documentation/git-rebase.txt | 6 +-
rebase-interactive.c | 1 +
sequencer.c | 24 +
From: Johannes Schindelin
The 'edit' command can be used to cherry-pick a commit and then
immediately drop out of the interactive rebase, with exit code 0, to let
the user amend the commit, or test it, or look around.
Sometimes this functionality would come in handy *without*
cherry-picking
Hi Junio,
On Thu, 6 Sep 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > This patch series completes the support for all rebase options in the
> > builtin rebase, e.g. --signoff, rerere-autoupdate, etc.
> >
>
Hi Phillip,
On Fri, 12 Oct 2018, Phillip Wood wrote:
> Hi Johannes
> On 12/10/2018 09:35, Johannes Schindelin wrote:
> > Hi Phillip,
> >
> > On Thu, 11 Oct 2018, Phillip Wood wrote:
> >
> >> I think this would be a useful addition to rebas
Hi Junio,
On Fri, 12 Oct 2018, Junio C Hamano wrote:
> From: Martin Koegler
> Date: Thu, 10 Aug 2017 20:13:08 +0200
>
> Signed-off-by: Martin Koegler
> Signed-off-by: Junio C Hamano
> ---
>
> * I made minimal adjustments to make the change apply to today's
>codebase. I still find some
Hi Junio,
On Thu, 11 Oct 2018, Junio C Hamano wrote:
> From: Johannes Schindelin
> Date: Thu, 27 Sep 2018 14:48:17 +0200
>
> The `--gpg-sign` option takes an *optional* argument, not a mandatory
> one.
>
> This was discovered as part of the investigation of
>
Hi Stefan,
On Wed, 10 Oct 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
> ---
>
> I still have this patch laying around, it simplifies the
Hi Lucas,
On Thu, 11 Oct 2018, Lucas De Marchi wrote:
> Do like it's done in grep so mode doesn't end up as
> 016, which means range-diff doesn't work if one has
> "submodule.diff = log" in the configuration. Without this
> while using range-diff I only get a
>
> Submodule a
On Thu, 11 Oct 2018, Lucas De Marchi wrote:
> On Wed, Oct 10, 2018 at 5:02 PM brian m. carlson
> wrote:
> >
> > On Wed, Oct 10, 2018 at 08:09:16AM -0700, Lucas De Marchi wrote:
> > > Do like it's done in grep so mode doesn't end up as
> > > 016, which means range-diff doesn't work if one
Hi Michael,
On Wed, 10 Oct 2018, Michael Witten wrote:
> In my opinion, the `--rebase-merges' feature has been broken since the
> beginning, and the builtin version should be fixed before it is moved
> ahead.
Everybody is entitled to an opinion. My opinion differs from yours, and I
am a heavy
Hi Phillip,
On Thu, 11 Oct 2018, Phillip Wood wrote:
> I think this would be a useful addition to rebase, there's one small
> comment below.
>
> On 10/10/2018 09:53, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > The 'edit' comm
Hi Junio & Eric,
On Thu, 11 Oct 2018, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> > On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget
> > wrote:
> >> We had not documented previously what happens when an `exec` command in
> >>
Hi Era,
On Sun, 7 Oct 2018, Era wrote:
> I discovered an apparent underflow when using the —unified=0 / -U0 flag with
> git-show on a merge commit.
> Leaving the flag on its default value or 1 shows the ranges correctly.
>
> $git --no-pager show -z --no-color --pretty=%x00%s%x00%b%x00
On Wed, 10 Oct 2018, Junio C Hamano wrote:
> Christian Hesse writes:
>
> > From: Christian Hesse
> >
> > We have targets 'install-man' and 'install-html', let's add build
> > targets as well.
> > ...
> > +man: $(GIT_SUBTREE_DOC)
> > +
> > +html: $(GIT_SUBTREE_HTML)
> > +
>
> As 'contrib'
Hi Junio,
On Sun, 7 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > Note: while this patch targets pk/rebase-in-c-6-final, it will not work
> > correctly without ag/rebase-i-in-c. So my suggestion is to rewrite the
&
Hi Junio,
On Sun, 7 Oct 2018, Junio C Hamano wrote:
> And then there is an unnamed misdesigned language that has a
> regmatch() function, which takes a string that contains a regular
> expression, but somehow requires that string to begin and end with a
> slash for no justifiable reason ;-).
It
Hi Junio,
On Wed, 10 Oct 2018, Junio C Hamano wrote:
> * js/mingw-wants-vista-or-above (2018-10-04) 3 commits
> - mingw: bump the minimum Windows version to Vista
> - mingw: set _WIN32_WINNT explicitly for Git for Windows
> - compat/poll: prepare for targeting Windows Vista
>
> The minimum
Hi Junio,
On Wed, 10 Oct 2018, Junio C Hamano wrote:
> We haven't seen much complaints and breakages reported against the
> two big "rewrite in C" topics around "rebase"; perhaps it is a good
> time to merge them to 'next' soonish to cook them for a few weeks
> before moving them to 'master'?
I
From: Johannes Schindelin
The 'edit' command can be used to cherry-pick a commit and then
immediately drop out of the interactive rebase, with exit code 0, to let
the user amend the commit, or test it, or look around.
Sometimes this functionality would come in handy *without*
cherry-picking
From: Johannes Schindelin
We had not documented previously what happens when an `exec` command in
an interactive rebase fails. Now we do.
Signed-off-by: Johannes Schindelin
---
Documentation/git-rebase.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
mention what happens in case an exec fails.
* Mentioned the break command in the git-rebase(1) documentation.
Johannes Schindelin (2):
rebase -i: clarify what happens on a failed `exec`
rebase -i: introduce the 'break' command
Documentation/git-rebase.txt | 6 +-
rebase-interactive.c
Hi Junio & Ananya,
Ananya, I think you did a really good job at contributing your first
patch, demonstrated by the useful comments you already received.
On Tue, 9 Oct 2018, Junio C Hamano wrote:
> Derrick Stolee writes:
>
> > On 10/8/2018 1:05 PM, Ananya Krishna Maram wrote:
> >> Hi All,
> >
Dear Git users,
It is my pleasure to announce that Git for Windows 2.19.1 is available from:
https://gitforwindows.org/
Changes since Git for Windows v2.19.0 (September 11th 2018)
New Features
* Comes with Git v2.19.1.
* Comes with Git LFS v2.5.2.
* Comes with Git Credential
duced code).
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
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
Hi Junio,
On Fri, 5 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The 'edit' command can be used to cherry-pick a commit and then
> > immediately drop out of the i
Hi Ananya,
On Thu, 4 Oct 2018, Ananya Krishna Maram wrote:
> On Thu, 4 Oct 2018 at 20:56, Johannes Schindelin
> wrote:
> >
> > [... talking about the reason why a slash does not need to be escaped
> > in a C string specifying a regular expression...]
> >
> >
Hi Ananya,
On Thu, 4 Oct 2018, Ananya Krishna Maram wrote:
> On Thu, 4 Oct 2018 at 19:56, Johannes Schindelin
> wrote:
> >
> > Hi Ananya,
> >
> > thank you for taking the time to write this patch!
> >
> > On Thu, 4 Oct 2018, Ananya Krishna Maram wr
Hi Ananya,
thank you for taking the time to write this patch!
On Thu, 4 Oct 2018, Ananya Krishna Maram wrote:
> the forward slash character should be escaped with backslash. Fix
> Unescaped forward slash error in Python regex statements.
>
> Signed-off-by: Ananya Krishna Maram
That explains
Hi Chris,
as mentioned by Stefan (who is a respected, active core Git contributor,
if you need any more arguments to listen to him), it is inappropriate to
copy the contents of the .git/ directory wholesale to another user's
machine.
For one, it would horribly break in case the user overrode
Hi René,
On Wed, 3 Oct 2018, René Scharfe wrote:
> oidset_insert() returns 1 if the object ID is already in the set and
> doesn't add it again, or 0 if it hadn't been present. Make use of that
> fact instead of checking with an extra oidset_contains() call.
>
> Signed-off-by: Rene Scharfe
>
From: Johannes Schindelin
Previously, we only ever declared a target Windows version if compiling
with Visual C.
Which meant that we were relying on the MinGW headers to guess which
Windows version we want to target...
Let's be explicit about it, in particular because we actually want to
bump
From: Johannes Schindelin
Windows Vista (and later) actually have a working poll(), but we still
cannot use it because it only works on sockets.
So let's detect when we are targeting Windows Vista and undefine those
constants, and define `pollfd` so that we can declare our own pollfd
struct
tps://support.microsoft.com/en-us/help/22882/windows-vista-end-of-support]
, but we do try to keep Git building on older Windows version, up until the
point when it becomes too big of a maintenance burden.
Johannes Schindelin (3):
compat/poll: prepare for targeting Windows Vista
mingw: set _WIN32_WI
From: Johannes Schindelin
Quite some time ago, a last plea to the XP users out there who want to
see Windows XP support in Git for Windows, asking them to get engaged
and help, vanished into the depths of the universe.
We tried for a long time to play nice with the last remaining XP users
who
From: Johannes Schindelin
The 'edit' command can be used to cherry-pick a commit and then
immediately drop out of the interactive rebase, with exit code 0, to let
the user amend the commit, or test it, or look around.
Sometimes this functionality would come in handy *without*
cherry-picking
se, with exit code 0, letting the user do things and stuff
and look around, with the idea of continuing the rebase later (using git
rebase --continue).
This patch introduces that, based on ag/rebase-i-in-c.
Johannes Schindelin (1):
rebase -i: introduce the 'break' command
rebase-interactive.c
Hi David,
On Mon, 24 Sep 2018, David Brown wrote:
> Howdy, I have a conundrum:
>
> App: Spring Cloud Config Server
> envvars: GIT_URL and SSH_KEY
> IDE: Intellij 2018.2.4 Ultimate
>
> When I use the IDE to assign the SSH_KEY value all is copacetic.
>
> If I assign the envvar at the Git Bash
Hi,
On Fri, 14 Sep 2018, Michal Fita wrote:
> Problem signature:
> Problem Event Name: APPCRASH
> Application Name: git.exe
> Application Version:2.19.0.1
> Application Timestamp: 5b980bc7
> Fault Module Name: ntdll.dll
> Fault Module Version: 6.1.7601.24117
>
Hi Ævar,
On Thu, 27 Sep 2018, Ævar Arnfjörð Bjarmason wrote:
> On Thu, Sep 27 2018, Nickolai Belakovski wrote:
>
> > Will do re: screenshot when I get home, although it's pretty easy to
> > imagine, the git branch output will have one other branch colored in green,
> > bit without the asterisk
Hi,
On Fri, 14 Sep 2018, Taylor Blau wrote:
> Hi Zachary,
>
> On Fri, Sep 14, 2018 at 09:43:43AM -0500, Zachary Bryant wrote:
> > When the installer asks for a default editor, it defaults to vim and
> > when I select either VS Code option, it won't allow me to proceed.
>
> It sounds like this
Hi Peff,
On Mon, 10 Sep 2018, Jeff King wrote:
> On Sun, Sep 09, 2018 at 07:19:51PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> > >> And then I turn that into:
> > >>
> > >> # @{u} because I happen to be on 'master' and it's shorter to type
> > >> # than origin/master...
> > >> git
Hi Daniel,
[I forgot to address this mail earlier, my apologies]
On Tue, 10 Jul 2018, Daniel Harding wrote:
> On Tue, 10 Jul 2018 at 16:08:57 +0300, Johannes Schindelin wrote:>
> > On Tue, 10 Jul 2018, Daniel Harding wrote:
> >
> > > On Mon, 09 Jul 2018 at 22:14:58
Hi Paul,
[late reply, I know, sorry about that!]
On Wed, 4 Jul 2018, Paul Smith wrote:
> On Wed, 2018-07-04 at 13:26 +0200, Johannes Schindelin wrote:
> > On Wed, 4 Jul 2018, Paul Smith wrote:
> >
> > > One thing I wanted to do was provide a default ca-bundle.crt file
&
Hi Phillip,
[sorry, I just got to this mail now]
On Sun, 6 May 2018, Phillip Wood wrote:
> On 27/04/18 21:48, Johannes Schindelin wrote:
> >
> > During a series of fixup/squash commands, the interactive rebase builds
> > up a commit message with comments. This will be
Hi Michael,
[blast from the past]
On Mon, 12 Sep 2016, Michael J Gruber wrote:
> As a side note, I'm wondering why MSYS-gpg version 1 is bundled with
> non-MSYS-git.
Those are two questions:
- an MSYS version of GPG is bundled because it was the stable one
available at the time when I had
Hi Sebastian,
On Wed, 5 Sep 2018, Sebastian Schuberth wrote:
> On 9/3/2018 11:10 PM, Johannes Schindelin via GitGitGadget wrote:
>
> > +if test -n "$TRAVIS_COMMIT"
> > +then
> > + # We are running within Travis CI
>
> Personally, I'd find a c
Hi Peff,
On Wed, 5 Sep 2018, Jeff King wrote:
> On Wed, Sep 05, 2018 at 02:38:34PM -0400, Eric Sunshine wrote:
>
> > On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin
> > wrote:
> > > So let's hear some ideas how to improve the situation, m'kay? Just
> > >
Hi Eric,
On Wed, 5 Sep 2018, Eric Sunshine wrote:
> On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin
> wrote:
> > So let's hear some ideas how to improve the situation, m'kay? Just as
> > a reminder, this is the problem I want to solve: I want to run the
> > tests
Hi Luke,
On Wed, 5 Sep 2018, Luke Diamand wrote:
> On 5 September 2018 at 13:39, Johannes Schindelin
> wrote:
> >
> > On Wed, 5 Sep 2018, Luke Diamand wrote:
> >
> >> On 4 September 2018 at 12:09, Johannes Schindelin
> >> wrote:
> >&g
Hi Thomas,
[quickly, as I will go back to a proper vacation after this]
On Wed, 12 Sep 2018, Thomas Gummerer wrote:
> diff --git a/linear-assignment.c b/linear-assignment.c
> index 9b3e56e283..7700b80eeb 100644
> --- a/linear-assignment.c
> +++ b/linear-assignment.c
> @@ -51,8 +51,8 @@ void
Dear Git users,
It is my pleasure to announce that Git for Windows 2.19.0 is available from:
https://gitforwindows.org/
Changes since Git for Windows v2.18.0 (June 22nd 2018)
New Features
* Comes with Git v2.19.0.
* There are now fast, built-in versions of git stash and git
Hi Junio,
On Tue, 4 Sep 2018, Junio C Hamano wrote:
> * jc/rebase-in-c-9-fixes (2018-09-04) 1 commit
> - rebase: re-add forgotten -k that stands for --keep-empty
> (this branch uses ag/rebase-i-in-c,
> js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c,
> pk/rebase-in-c-2-basic,
Hi Luke,
On Wed, 5 Sep 2018, Luke Diamand wrote:
> On 4 September 2018 at 12:09, Johannes Schindelin
> wrote:
> >
> > On Tue, 4 Sep 2018, Eric Sunshine wrote:
> >
> >> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
> >> wrote:
>
Hi Junio,
On Tue, 4 Sep 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > + test_must_fail git -c core.editor="grep -q ^pick" \
> > + rebase -ki --autosquash HEAD~4 &&
>
> When merged to 'pu'
Signed-off-by: Pratik Karki
+Signed-off-by: Johannes Schindelin
diff --git a/builtin/rebase.c b/builtin/rebase.c
--- a/builtin/rebase.c
2: cb9129890b ! 2: 1e2ce4b34e builtin rebase: support --signoff
@@ -7,6 +7,7 @@
handling is left to the rebase backend
github.com/gitgitgadget/git/pull/32
Range-diff vs v1:
1: c5f67c35ea ! 1: fba1b3e2a9 builtin rebase: support --onto
@@ -15,6 +15,7 @@
command name, but to the first (non-option) command-line parameter.
Signed-off-by: Pratik Karki
+Signed-off-by: Johannes
301 - 400 of 5954 matches
Mail list logo
