On Fri, Oct 4, 2019 at 4:49 AM Phillip Wood wrote:
>
> Hi Junio
>
> On 03/10/2019 06:04, 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
The synopsis section in git-rev-list.txt has grown to be a huge list
that probably needs its own synopsis. Since the list is huge, users may
be given the false impression that the list is complete, however it is
not. It is missing many of the available options.
Since the list of options in the syn
Signed-off-by: Pratyush Yadav
---
Documentation/git-gui.txt | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index 5f93f8003d..98337b69f1 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -114
It is a good idea to have a readme so people finding the project can
know more about it, and know how they can get involved.
Signed-off-by: Pratyush Yadav
---
I don't have much experience writing this kind of readme or
documentation, so comments are appreciated. Please feel free to chime in
with
Make it explicit that we always want trace2 "version" events to be the
first event of any trace session. Also list the changes that would or
would not cause the EVENT format version field to be incremented.
Change-Id: I20b9ac1fa0786bcaad7e290cc805cbf45b323021
Signed-off-by: Josh Steadmon
---
Doc
Changes since V4:
* Avoid the use of the non-specific term "overload" in code, trace
output, commit messages, and documentation.
* Remove an unnecessary include that was breaking the Windows
build.
Josh Steadmon (4):
docs: mention trace2 target-dir mode in git-config
docs: clarify trace2
Move the description of trace2's target-directory behavior into the
shared trace2-target-values file so that it is included in both the
git-config and api-trace2 docs. Leave the SID discussion only in
api-trace2 since it's a technical detail.
Change-Id: I3d052c5904684e981f295d64aa2c5d62cfaa4500
Si
trace2 can write files into a target directory. With heavy usage, this
directory can fill up with files, causing difficulty for
trace-processing systems.
This patch adds a config option (trace2.maxFiles) to set a maximum
number of files that trace2 will write to a target directory. The
following b
Add a new "discard" event type for trace2 event destinations. When the
trace2 file count check creates a sentinel file, it will include the
normal trace2 output in the sentinel, along with this new discard
event.
Writing this message into the sentinel file is useful for tracking how
often the file
On 2019.10.04 11:12, Johannes Schindelin wrote:
> Hi Josh,
>
> On Thu, 3 Oct 2019, Josh Steadmon wrote:
>
> > [...]
> > diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
> > index 5dda0ca1cd..af3405f179 100644
> > --- a/trace2/tr2_dst.c
> > +++ b/trace2/tr2_dst.c
> > @@ -1,3 +1,5 @@
> > +#include
Hi Junio,
On Fri, 4 Oct 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > +test_expect_success 'parallel' '
> > + git remote add one ./bogus1 &&
> > + git remote add two ./bogus2 &&
> > +
> > + test_must_fail env GIT_TRACE="$PWD/trace" \
> > + g
When `git am` runs into a corrupt patch, it'll error out and give a
message such as,
error: corrupt patch at line 87
Casual users of am may assume that this line number refers to the
file that they provided on the command-line. This assumption, however,
is incorrect. The line count reall
On 2019.10.04 09:25, Junio C Hamano wrote:
> Josh Steadmon writes:
>
> > trace2 can write files into a target directory. With heavy usage, this
> > directory can fill up with files, causing difficulty for
> > trace-processing systems.
>
> Sorry for not mentioning this, but "don't overload" is a
This is yet another patch from Git for Windows.
Changes since v2:
* The paths returned by git rev-parse --git-path are now cached, and the
cache is primed with the most common paths.
Changes since v1:
* Rather than a fine-grained override of gitdir just for the hooks path, we
now spawn
From: Johannes Schindelin
Since v2.9.0, Git knows about the config variable core.hookspath
that allows overriding the path to the directory containing the
Git hooks.
Since v2.10.0, the `--git-path` option respects that config
variable, too, so we may just as well use that command.
For Git versi
While reviewing some dts diffs recently I noticed that the hunk header
logic was failing to find the containing node. This is because the regex
doesn't consider properties that may span multiple lines, i.e.
property = ,
;
and it got hung up on comments inside nodes that
Hi Hannes,
On Fri, 4 Oct 2019, Johannes Sixt wrote:
> Am 04.10.19 um 11:55 schrieb Johannes Schindelin:
> > On Fri, 4 Oct 2019, Junio C Hamano wrote:
> >> These three look good and too similar to each other, which makes me
> >> wonder if we want to allow them simply write
> >>
> >>return inse
Hi Pratyush,
On Fri, 4 Oct 2019, Pratyush Yadav wrote:
> On 01/10/19 07:38PM, Johannes Schindelin wrote:
> >
> > On Tue, 1 Oct 2019, Pratyush Yadav wrote:
> >
> > > On 30/09/19 11:42AM, Johannes Schindelin wrote:
> > > > On Fri, 27 Sep 2019, Pratyush Yadav wrote:
> > > > > On 27/09/19 08:10AM, Be
Assist Request from You Please let this not be a surprised message to
you because I decided to contact you on this magnitude and lucrative
transaction for our present and future survival in life. Moreover, I
have laid all the solemn trust in you before i decided to disclose
this successful and conf
Strip "UTF" and an optional dash from the start of 'upper' without
passing a NULL pointer to skip_prefix() in the second call, as it cannot
handle that.
Signed-off-by: René Scharfe
---
convert.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/convert.c b/convert.c
ind
Greetings
We are interested in Inquiring a prospective investment opportunity with you.
Sharath Holdings S.P.C executes public & private offerings, mergers and
acquisitions, and initial public offerings. These can take either the form of
investment in start-up companies, greenfield projects, or
Junio C Hamano wrote:
> Eric Wong writes:
>
> > That seems too tedious. I'm learning towards just initializing
> > var = NULL in the start of the for-loop:
> >
> > @@ -449,7 +449,8 @@ static inline struct hashmap_entry
> > *hashmap_iter_first(struct hashmap *map,
> > * containing a @member w
Am 04.10.19 um 11:55 schrieb Johannes Schindelin:
> On Fri, 4 Oct 2019, Junio C Hamano wrote:
>> These three look good and too similar to each other, which makes me
>> wonder if we want to allow them simply write
>>
>> return insert_pos_as_negative_offset(nr);
>>
>> with something like
>>
>>
On 01/10/19 07:38PM, Johannes Schindelin wrote:
> Hi,
>
> On Tue, 1 Oct 2019, Pratyush Yadav wrote:
>
> > On 30/09/19 11:42AM, Johannes Schindelin wrote:
> > > On Fri, 27 Sep 2019, Pratyush Yadav wrote:
> > > > On 27/09/19 08:10AM, Bert Wesarg wrote:
> > > > > On Fri, Sep 27, 2019 at 12:40 AM Pra
On 04/10/2019 16:22, Bert Wesarg wrote:
On Thu, Oct 3, 2019 at 11:40 PM Philip Oakley wrote:
On 03/10/2019 21:54, Pratyush Yadav wrote:
My only remaining bikeshed question it prompted was to check which parts
would be committed as part of committing the whole "hunk". But haven't had
time to lo
From: Johannes Schindelin
The return value of that function is 0 both for variables that are
unset, as well as for variables whose values are empty. To discern those
two cases, one has to call `GetLastError()`, whose return value is
`ERROR_ENVVAR_NOT_FOUND` and `ERROR_SUCCESS`, respectively.
Exc
From: Johannes Schindelin
This adds the common guards that allow headers to be #include'd multiple
times.
Signed-off-by: Johannes Schindelin
---
compat/win32/path-utils.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h
index 0f70d4
From: Johannes Schindelin
MSVC would complain thusly:
C4200: nonstandard extension used: zero-sized array in struct/union
Let's just use the `FLEX_ARRAY` constant that we introduced for exactly
this type of scenario.
Signed-off-by: Johannes Schindelin
---
compat/winansi.c | 2 +-
1 file
From: Johannes Schindelin
In the CI builds, we bundle all generated files into a so-called
artifacts `.tar` file, so that the test phase can fan out into multiple
parallel builds.
This patch makes sure that all files are included in the `vcxproj`
target which are needed for that artifacts `.tar`
From: Johannes Schindelin
... because we can, now. Technically, we actually build using `MSBuild`,
which is however pretty close to building interactively in Visual
Studio.
As there is no convenient way to run Git's test suite in Visual Studio,
we unpack a Portable Git to run it, using the just-
Git's Continuous Integration (CI) includes an Azure Pipeline that builds Git
on Linux, macOS and Windows, in the former two cases even in multiple
configurations (using GCC vs clang, 32-bit vs 64-bit, etc). On Windows, we
only build using GCC, using (a subset of) Git for Windows' SDK.
Recently, a
From: Johannes Schindelin
This was a left-over from the previous YAML schema, and it no longer
works. The problem was noticed while editing `azure-pipelines.yml` in VS
Code with the very helpful "Azure Pipelines" extension (syntax
highlighting and intellisense for `azure-pipelines.yml`...).
Sign
From: Johannes Schindelin
To build with MSVC, we "translate" GCC options to MSVC options, and part
of those options refer to the libraries to link into the final
executable. Currently, this part looks somewhat like this on Windows:
-lcurl -lnghttp2 -lidn2 -lssl -lcrypto -lssl -lcrypto -l
From: Johannes Schindelin
Git for Windows jumps through hoops to provide a development environment
that allows to build Git and to run its test suite. To that end, an
entire MSYS2 system, including GNU make and GCC is offered as "the Git
for Windows SDK". It does come at a price: an initial downl
From: Johannes Schindelin
We frequently build Git using the `DEVELOPER=1` make setting as a
shortcut to enable all kinds of more stringent compiler warnings.
Those compiler warnings are relatively specific to GCC, though, so let's
try our best to translate them to the equivalent options to pass
From: Johannes Schindelin
MSVC complains about this with `-Wall`, which can be taken as a sign
that this is indeed a real bug. The symptom is:
C4146: unary minus operator applied to unsigned type, result
still unsigned
Let's avoid this warning in the minimal way, e.g. writing `-
From: Johannes Schindelin
When the `--immediate` option is in effect, any test failure will
immediately exit the test script. Together with `--write-junit-xml`, we
will want the JUnit-style `.xml` file to be finalized (and not leave the
XML incomplete). Let's make it so.
This comes in particular
From: Johannes Schindelin
In b18ae14a8f6 (vcxproj: also link-or-copy builtins, 2019-07-29), we
started to copy or hard-link the built-ins as a post-build step of the
`git` project.
At the same time, we tried to copy or hard-link `git-remote-http.exe`,
but it is quite possible that it was not bui
From: Johannes Schindelin
This function is marked as `NORETURN`, and it indeed does not want to
return anything. So let's not declare it with the return type `int`.
This fixes the following warning when building with MSVC:
C4646: function declared with 'noreturn' has non-void return type
"brian m. carlson" writes:
> I think GitGitGadget is a useful tool which I haven't really had the
> time to learn how to use. I appreciate that many people prefer a
> patch-based workflow, and that using a patch-based workflow and a
> mailing list provides the project independence and avoids fav
Derrick Stolee writes:
> On 9/25/2019 9:36 AM, Pierre Tardy wrote:
[...]
>> And why restrict on DVCS?
>> Isn't it admitted that the distributed version control is nowadays
>> much better in term of software productivity?
>> Is there some use cases that "traditional" centralized VCS are better
>> o
From: Johannes Schindelin
When Git wants to spawn a child Git process inside a worktree's
subdirectory while `GIT_DIR` is set, we need to take care of specifying
the work tree's top-level directory explicitly because it cannot be
discovered: the current directory is _not_ the top-level directory
I saw this issue a couple times in my setup, and always wondered why nobody
else seemed to be hit by this. When I finally found/made some time to
investigate, I found out that it really requires a specific setup: I have
many worktrees connected to my main git.git clone, often run inside t/ and I
do
On 10/4/2019 4:52 AM, Johannes Schindelin wrote:
> Hi George,
>
> if you have Visual Studio, you could also check out the `vs/master`
> branch of https://github.com/git-for-windows/git and build Git inside
> Visual Studio. The tests can still be run in Git Bash (the regular one
> this time, no nee
On 04/10/19 10:49AM, Johannes Schindelin wrote:
> Hi Pratyush,
>
> please don't top-post on this list (yet another of these things
> requiring extra brain cycles in the mailing list workflow).
I didn't top-post, or at least it wasn't the intention. The text above
the quoted text is the "preface"
Don't forget the reply-all..
On 04/10/2019 11:48, Colin Agnew wrote:
Hi,
Sorry the screenshot was blocked. The screenshot:
http://media.makingthingswork.org/gui.png
png shows https://git-scm.com/video/what-is-version-control 2m:21s
position, and the spoken word is that it is the "GitHub for
Elijah Newren writes:
> On Thu, Sep 19, 2019 at 11:37 AM Derrick Stolee wrote:
[...]
>> II. Approach
>>
>> The action items below match the problems listed above.
>>
>> 1. Improve the documentation for contributing to Git.
>>
>> In preparation for this email, I talked to someone familiar with is
On Fri, 4 Oct 2019 at 12:14, Philip Oakley wrote:
> On 04/10/2019 08:19, Colin Agnew wrote:
> > Could you confirm which GUI is featured in the first video?
> > Please advise - thanks
> Dunno,
>
> Do you have a web reference for the "Git Basics Episode 1" and then
> which video you are watching?
I
On 04/10/2019 08:19, Colin Agnew wrote:
Could you confirm which GUI is featured in the first video?
Please advise - thanks
Dunno,
Do you have a web reference for the "Git Basics Episode 1" and then
which video you are watching?
I guess that if it is the plain vanila Git, then it will be `git
Hi Junio,
On Fri, 4 Oct 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > While at it, we take care of reporting overflows (which are unlikely,
> > but hey, defensive programming is good!).
> >
> > We _also_ take pains of casting the unsigned value to signed: o
Hi Junio
On 03/10/2019 06:04, 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 appear in any of
the integration branches, but I am still
Hi Rohit
The handling of ident_split is looking better now but I've got a
question below about returning vs going to a cleanup section when
there's an error.
On 07/09/2019 12:50, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the committer date
by changing it to the auth
Hi Junio,
On Fri, 4 Oct 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > This function is marked as `NORETURN`, and it indeed does not want to
> > return anything. So let's not declare it with the return type `int`.
> > This
Hi Alexander,
On Thu, 3 Oct 2019, Alexander Mills wrote:
> when running git commands outside of a git repo, we often see:
>
> fatal: Not a git repository (or any of the parent directories): .git
>
> such a lame message lol.
An equally ornery response might point out that reporting this as a bug
Hi Rohit
On 07/09/2019 12:50, Rohit Ashiwal wrote:
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to tre
Hi Junio,
On Fri, 4 Oct 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/builtin/stash.c b/builtin/stash.c
> > index b5a301f24d..a1e2e7ae7e 100644
> > --- a/builtin/stash.c
> > +++ b/builtin/stash.c
> > @@ -497,6 +497,8 @@ static int do_apply_stas
Hi Josh,
On Thu, 3 Oct 2019, Josh Steadmon wrote:
> [...]
> diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
> index 5dda0ca1cd..af3405f179 100644
> --- a/trace2/tr2_dst.c
> +++ b/trace2/tr2_dst.c
> @@ -1,3 +1,5 @@
> +#include
> +
This completely breaks the Windows build:
In file inclu
Hi George,
if you have Visual Studio, you could also check out the `vs/master`
branch of https://github.com/git-for-windows/git and build Git inside
Visual Studio. The tests can still be run in Git Bash (the regular one
this time, no need for the Git for Windows SDK in that case).
Ciao,
Johannes
Hi Pratyush,
please don't top-post on this list (yet another of these things
requiring extra brain cycles in the mailing list workflow).
On Fri, 4 Oct 2019, Pratyush Yadav wrote:
> Hi Harish,
>
> Thanks for the patch. Unfortunately, it seems your mail client messed up
> the formatting, and the p
Could you confirm which GUI is featured in the first video?
Please advise - thanks
60 matches
Mail list logo
