Git Basics Episode 1 GUI

2019-10-04 Thread Colin Agnew
Could you confirm which GUI is featured in the first video? Please advise - thanks

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-04 Thread Johannes Schindelin
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

Re: [Outreachy] Outreachy internship program

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v4 3/4] trace2: don't overload target directories

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH 1/1] stash apply: report status correctly even in a worktree's subdirectory

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag

2019-10-04 Thread Phillip Wood
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

Re: bad error message - Not a git repository (or any of the parent directories): .git

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v2 01/13] push: do not pretend to return `int` from `die_push_simple()`

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v4 3/6] rebase -i: support --committer-date-is-author-date

2019-10-04 Thread Phillip Wood
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

Re: What's cooking in git.git (Oct 2019, #01; Thu, 3)

2019-10-04 Thread Phillip Wood
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

Re: [PATCH v2 02/13] msvc: avoid using minus operator on unsigned types

2019-10-04 Thread Johannes Schindelin
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

Re: Git Basics Episode 1 GUI

2019-10-04 Thread Philip Oakley
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

Re: Git Basics Episode 1 GUI

2019-10-04 Thread Mateusz Loskot
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

Re: [DISCUSSION] Growing the Git community

2019-10-04 Thread Jakub Narebski
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

Re: Git Basics Episode 1 GUI

2019-10-04 Thread Philip Oakley
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

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-04 Thread Pratyush Yadav
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"

Re: [Outreachy] Outreachy internship program

2019-10-04 Thread Derrick Stolee
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

[PATCH v2 0/1] stash apply: be prepared to run in a worktree's subdirectory

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v2 1/1] stash apply: report status correctly even in a worktree's subdirectory

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

Re: [DISCUSSION] Growing the Git community

2019-10-04 Thread Jakub Narebski
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

Re: [DISCUSSION] Growing the Git community

2019-10-04 Thread Jakub Narebski
"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

[PATCH v3 01/13] push: do not pretend to return `int` from `die_push_simple()`

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 10/13] test-tool run-command: learn to run (parts of) the testsuite

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 06/13] msvc: handle DEVELOPER=1

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 02/13] msvc: avoid using minus operator on unsigned types

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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 `-

[PATCH v3 11/13] tests: let --immediate and --write-junit-xml play well together

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 07/13] msvc: work around a bug in GetEnvironmentVariable()

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 04/13] compat/win32/path-utils.h: add #include guards

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 03/13] winansi: use FLEX_ARRAY to avoid compiler warning

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 09/13] vcxproj: include more generated files

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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`

[PATCH v3 08/13] vcxproj: only copy `git-remote-http.exe` once it was built

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 13/13] ci: also build and test with MS Visual Studio on Azure Pipelines

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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-

[PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 12/13] ci: really use shallow clones on Azure Pipelines

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 05/13] msvc: ignore some libraries when linking

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-04 Thread Philip Oakley
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

Re: [PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

2019-10-04 Thread Pratyush Yadav
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

Re: [PATCH v2 02/13] msvc: avoid using minus operator on unsigned types

2019-10-04 Thread Johannes Sixt
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 >> >>

Re: [PATCH v2 18/19] OFFSETOF_VAR macro to simplify hashmap iterators

2019-10-04 Thread Eric Wong
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

INVESTMENT OPPORTUNITY

2019-10-04 Thread Ahmed Nashwan Ahmed
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

[PATCH] convert: fix handling of dashless UTF prefix in validate_encoding()

2019-10-04 Thread René Scharfe
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 to You

2019-10-04 Thread mike anderson
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

Re: [PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v2 02/13] msvc: avoid using minus operator on unsigned types

2019-10-04 Thread Johannes Schindelin
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

[PATCH] userdiff: Fix some corner cases in dts regex

2019-10-04 Thread Stephen Boyd
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

[PATCH v3 0/1] git-gui: respect core.hooksPath, falling back to .git/hooks

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

[PATCH v3 1/1] Fix gitdir e.g. to respect core.hooksPath

2019-10-04 Thread Johannes Schindelin via GitGitGadget
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

Re: [PATCH v4 3/4] trace2: don't overload target directories

2019-10-04 Thread Josh Steadmon
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

[PATCH] apply: tell user location of corrupted patch file

2019-10-04 Thread Denton Liu
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

Re: [PATCH 1/1] fetch: let --jobs= parallelize --multiple, too

2019-10-04 Thread Johannes Schindelin
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

Re: [PATCH v4 3/4] trace2: don't overload target directories

2019-10-04 Thread Josh Steadmon
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

[PATCH v5 3/4] trace2: discard new traces if target directory has too many files

2019-10-04 Thread Josh Steadmon
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

[PATCH v5 4/4] trace2: write discard message to sentinel files

2019-10-04 Thread Josh Steadmon
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

[PATCH v5 2/4] docs: clarify trace2 version invariants

2019-10-04 Thread Josh Steadmon
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

[PATCH v5 0/4] trace2: discard new traces if the target directory contains too many files

2019-10-04 Thread Josh Steadmon
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

[PATCH v5 1/4] docs: mention trace2 target-dir mode in git-config

2019-10-04 Thread Josh Steadmon
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

[PATCH] git-gui: add a readme

2019-10-04 Thread Pratyush Yadav
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

[PATCH] Documentation: update the location of the git-gui repo

2019-10-04 Thread Pratyush Yadav
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

[PATCH] git-rev-list.txt: prune options in synopsis

2019-10-04 Thread Denton Liu
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

Re: What's cooking in git.git (Oct 2019, #01; Thu, 3)

2019-10-04 Thread Elijah Newren
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