[PATCH 0/1] git-gui (Windows): use git-bash.exe if it is available

... and yet another patch that is carried in Git for Windows for quite a long time. This commit was contributed as https://github.com/patthoyts/git/gui/pull/6 which was ignored for almost three years, and then as https://github.com/prati0100/git-gui/pull/2 which was rejected in favor of a mailin

[PATCH 1/1] git gui: fix staging a second line to a 1-line file

From: Johannes Schindelin When a 1-line file is augmented by a second line, and the user tries to stage that single line via the "Stage Line" context menu item, we do not want to see "apply: corrupt patch at line 5". The reason for this error was that the hunk he

[PATCH 0/1] git gui: fix staging a second line to a 1-line file

/git-gui/pull/1 which was rejected in favor of a mailing list-centric workflow. The patch is based on Git GUI's master branch at https://github.com/prati0100/git-gui/. Johannes Schindelin (1): git gui: fix staging a second line to a 1-line file lib/diff.tcl | 1 + 1 file changed, 1 inse

[PATCH 4/4] git-gui--askyesno (mingw): use Git for Windows' icon, if available

From: Johannes Schindelin For additional GUI goodness. Signed-off-by: Johannes Schindelin --- git-gui--askyesno | 12 1 file changed, 12 insertions(+) diff --git a/git-gui--askyesno b/git-gui--askyesno index 45b0260eff..c0c82e7cbd 100755 --- a/git-gui--askyesno +++ b/git-gui

[PATCH 3/4] git-gui--askyesno: allow overriding the window title

From: Johannes Schindelin "Question?" is maybe not the most informative thing to ask. In the absence of better information, it is the best we can do, of course. However, Git for Windows' auto updater just learned the trick to use git-gui--askyesno to ask the user whether to up

[PATCH 2/4] git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- git-gui.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 76d8139b8d..66f046a0c7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1248,6 +1248,9 @@ set have_tk85 [expr {[package vcompare

[PATCH 0/4] git-gui: GIT_ASK_YESNO/GIT_ASKPASS patches from Git for Windows

helper for retry fallback on Windows Johannes Schindelin (3): git gui: set GIT_ASKPASS=git-gui--askpass if not set yet git-gui--askyesno: allow overriding the window title git-gui--askyesno (mingw): use Git for Windows' icon, if available Makefile | 2 ++ git-gui

sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

Hi Peff, On Mon, 23 Sep 2019, Jeff King wrote: > On Thu, Sep 19, 2019 at 10:48:30PM +0200, René Scharfe wrote: > > > Use the macro COPY_ARRAY to copy array elements and MOVE_ARRAY to do the > > same for moving them backwards in an array with potential overlap. The > > result is shorter and safer

Re: [PATCH 0/3] fixes related to `make hdr-check`

Hi Denton, On Mon, 23 Sep 2019, Denton Liu wrote: > This patchset relates to `make hdr-check`. The first patch addresses > getting it to run on platforms which require custom CFLAGS. > > The other two patches address errors/warnings caught by actually running > `make hdr-check`. > > > Denton Liu

Re: [PATCH 1/3] Makefile: use $(ALL_CFLAGS) in $(HCO) target

Hi Denton, On Mon, 23 Sep 2019, Denton Liu wrote: > On platforms that can run `make hdr-check` but require custom flags, > this target was failing because none of them were being passed to the > compiler. For example, on MacOS, the NO_OPENSSL flag was being set but > it was not being passed into

Re: Git in Outreachy December 2019?

Hi Eric, On Tue, 24 Sep 2019, Eric Wong wrote: > Johannes Schindelin wrote: > > On Mon, 16 Sep 2019, Emily Shaffer wrote: > > > - try and make progress towards running many tests from a single test > > >file in parallel - maybe this is too big, I'm not sure

Re: Git in Outreachy December 2019?

Hi, On Mon, 23 Sep 2019, SZEDER Gábor wrote: > On Wed, Sep 04, 2019 at 03:41:15PM -0400, Jeff King wrote: > > The project page has a section to point people in the right direction > > for first-time contributions. I've left it blank for now, but I think it > > makes sense to point one (or both) o

Re: Git in Outreachy December 2019?

Hi, On Mon, 23 Sep 2019, SZEDER Gábor wrote: > On Mon, Sep 23, 2019 at 02:47:23PM +0200, Johannes Schindelin wrote: > > > > On Tue, 17 Sep 2019, SZEDER Gábor wrote: > > > > > On Tue, Sep 17, 2019 at 01:23:18PM +0200, Johannes Schindelin wrote: > > > >

Re: Virtual Git Contributor Summit

On Thu, 26 Sep 2019, Eric Wong wrote: > James Ramsay wrote: > > On 3 Jul 2019, at 9:01, Johannes Schindelin wrote: > > > > > > I kept talking about this idea of a purely online Git Contributor > > > Summit, and it is finally time for action. > > > &

Re: [PATCH v2 00/19] hashmap bug/safety/ease-of-use fixes

Hi Eric, On Tue, 24 Sep 2019, Eric Wong wrote: > Patches 1-11 are largely unchanged from the original series with the > exception of 2, which is new and posted at: > > https://public-inbox.org/git/20190908074953.kux7zz4y7iolqko4@whir/ > > 12-17 take further steps to get us away from hashmap

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

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 04/13] compat/win32/path-utils.h: add #include guards

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

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

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. wr

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

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

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

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

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

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

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

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 com

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

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:

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

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

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

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-pip

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

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

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

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 -lss

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

ne: the project files are generated, MSBuild (which is kind of the command-line equivalent of Visual Studio's "Build" operation) is used to build Git, and then a parallelized test job runs the test suite in a Portable Git. These patches are based on js/visual-studio. Johannes Schindeli

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

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

[PATCH 2/2] stash: handle staged changes in skip-worktree files correctly

From: Johannes Schindelin When calling `git stash` while changes were staged for files that are marked with the `skip-worktree` bit (e.g. files that are excluded in a sparse checkout), the files are recorded as _deleted_ instead. The reason is that `git stash` tries to construct the tree

[PATCH 0/2] Fix git stash with skip-worktree entries

opted to introduce a new mode that does what git stash needs in order to fix the bug. Johannes Schindelin (2): update-index: optionally leave skip-worktree entries alone stash: handle staged changes in skip-worktree files correctly Documentation/git-update-index.txt |

[PATCH 1/2] update-index: optionally leave skip-worktree entries alone

From: Johannes Schindelin While `git update-index` mostly ignores paths referring to index entries whose skip-worktree bit is set, in b4d1690df11 (Teach Git to respect skip-worktree bit (reading part), 2009-08-20), for reasons that are not entirely obvious, the `--remove` option was made special

Re: [PATCH 1/1] git-add--interactive.perl: Add progress counter in the prompt

Hi, On Mon, 23 Sep 2019, Kunal Tyagi via GitGitGadget wrote: > From: Kunal Tyagi > > Signed-off-by: Kunal Tyagi Could you move most (if not all) of the explanation from the cover letter (read: the PR description) into the commit message? The patch looks good, I just have one suggestion: > --

Re: [PATCH 0/1] git-add--interactive.perl: Add progress counter in the prompt

Hi, On Mon, 23 Sep 2019, Kunal Tyagi via GitGitGadget wrote: > Hi git contributors! > > I'm Kunal Tyagi. While I was choosing the relevant patches for a commit > using the git add -p command, I found that there was no feedback regarding > how many hunks from the current file had been processed an

Re: [PATCH 1/1] contrib/buildsystems: fix Visual Studio Debug configuration

Hi Alexandr, On Mon, 23 Sep 2019, Alexandr Miloslavskiy via GitGitGadget wrote: > From: Alexandr Miloslavskiy > > Even though Debug configuration builds, the resulting build is incorrect > in a subtle way: it mixes up Debug and Release binaries, which in turn > causes hard-to-predict bugs. > > I

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

From: Johannes Schindelin When Git wants to spawn a child Git process inside a worktree's subdirectory, 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 of the work

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

do stash quite often (now that git stash's performance is a joy on Windows). Johannes Schindelin (1): stash apply: report status correctly even in a worktree's subdirectory builtin/stash.c | 2 ++ t/t3908-stash-in-worktree.sh | 27 +++ 2 files c

Re: [PATCH] add a Code of Conduct document

Hi, On Tue, 24 Sep 2019, Jeff King wrote: > On Tue, Sep 24, 2019 at 10:14:55PM +0200, René Scharfe wrote: > > > > +* Trolling, insulting/derogatory comments, and personal or > > > political attacks > > > > Hmm. Trolling can be helpful, if done right. I consider this to be > > a good example: ht

[PATCH 1/2] Move git_sort(), a stable sort, into into libgit.a

From: Johannes Schindelin The `qsort()` function is not guaranteed to be stable, i.e. it does not promise to maintain the order of items it is told to consider equal. In contrast, the `git_sort()` function we carry in `compat/qsort.c` _is_ stable, by virtue of implementing a merge sort algorithm

[PATCH 2/2] diffcore_rename(): use a stable sort

From: Johannes Schindelin During Git's rename detection, the file names are sorted. At the moment, this job is performed by `qsort()`. As that function is not guaranteed to implement a stable sort algorithm, this can lead to inconsistent and/or surprising behavior: a rename might be det

[PATCH 0/2] Git's rename detection requires a stable sort

er). The solution: use a stable sort. Note: this patch series is based on top of en/merge-recursive-cleanup. Johannes Schindelin (2): Move git_sort(), a stable sort, into into libgit.a diffcore_rename(): use a stable sort Makefile | 2 +- compat/mingw.c| 5 -

Re: Git in Outreachy December 2019?

Hi Peff, On Mon, 23 Sep 2019, Jeff King wrote: > On Mon, Sep 23, 2019 at 02:47:23PM +0200, Johannes Schindelin wrote: > > > The evaluation of the lazy prereq is indeed not different between Bash > > or dash. It is nevertheless quite disruptive in the trace of a test > >

Re: Git in Outreachy December 2019?

Hi Peff, On Mon, 23 Sep 2019, Jeff King wrote: > On Tue, Sep 17, 2019 at 01:23:18PM +0200, Johannes Schindelin wrote: > > > The only slightly challenging aspect might be that `merge-one-file` is > > actually not a merge strategy, but it is used as helper to be passed to > &g

Re: [PATCH] add a Code of Conduct document

Hi Gábor, On Tue, 24 Sep 2019, SZEDER Gábor wrote: > On Tue, Sep 24, 2019 at 02:44:54AM -0400, Jeff King wrote: > > We've never had a formally written Code of Conduct document. Though it > > has been discussed off and on over the years, for the most part the > > behavior on the mailing list has b

Re: [DISCUSSION] Growing the Git community

Hi Stolee, On Thu, 19 Sep 2019, Derrick Stolee wrote: > During the Virtual Git Contributors' Summit, Dscho brought up the topic of > "Inclusion & Diversity". We discussed ideas for how to make the community > more welcoming to new contributors of all kinds. Let's discuss some of > the ideas we ta

Re: [DISCUSSION] Growing the Git community

Hi Mike, On Fri, 20 Sep 2019, Mike Hommey wrote: > On Thu, Sep 19, 2019 at 12:30:13PM -0400, Derrick Stolee wrote: > > During the Virtual Git Contributors' Summit, Dscho brought up the topic of > > "Inclusion & Diversity". We discussed ideas for how to make the community > > more welcoming to ne

git-gui contributions, was Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

Hi, On Wed, 18 Sep 2019, Junio C Hamano wrote: > We have a new maintainer for git-gui now. Thanks Pratyush for > volunteering. Excellent! I opened PRs at https://github.com/prati0100/git-gui/pulls. Pratyush, do you accept contributions in this form, or should I do anything differently? Ciao,

Re: Git in Outreachy December 2019?

Hi, On Tue, 17 Sep 2019, Christian Couder wrote: > On Tue, Sep 17, 2019 at 1:28 PM Johannes Schindelin > wrote: > > On Mon, 16 Sep 2019, Emily Shaffer wrote: > > > > > - reduce/eliminate use of fetch_if_missing global > > I like this one! It looks as if a (non

Re: Git in Outreachy December 2019?

Hi, On Tue, 17 Sep 2019, SZEDER Gábor wrote: > On Tue, Sep 17, 2019 at 01:23:18PM +0200, Johannes Schindelin wrote: > > Also, things like the code tracing via `-x` (which relies on Bash > > functionality in order to work properly, > > Not really. To work properly. What I m

Re: Git in Outreachy December 2019?

Hi Emily, On Mon, 16 Sep 2019, Emily Shaffer wrote: > Jonathan Tan, Jonathan Nieder, Josh Steadmon and I met on Friday to > talk about projects and we came up with a trimmed list; not sure what > more needs to be done to make them into fully-fledged proposals. Thank you for doing this! > For st

Re: [PATCH] completion: add missing completions for log, diff, show

rsion on the web: https://github.com/git/git/blob/todo/whats-cooking.txt Ciao, Johannes > > On Thu, Sep 12, 2019 at 4:54 AM Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > > > Hi Max, > > > > The patch looks good to me! > > > > Thanks, > &

Re: could not fork child process rebasing required

Hi Sebastian, On Thu, 12 Sep 2019, Castro Alvarez, Sebastian wrote: > I have tried with both versions 32-bit and 64-bit, none of them work > for me, I still get the same error. :( The most common reason for this, then, would be an overzealous anti-malware. Ciao, Johannes

Re: error: could not read '.git/rebase-apply/head-name': No such file or directory

Hi Eugen, On Thu, 12 Sep 2019, Eugen Konkov wrote: > $ git --version > git version 2.20.1 First thing to try is whether Git v2.23.0 still exposes that bug. Ciao, Johannes

Re: [PATCH v2 1/1] contrib/hooks: escape left brace in regex in the paranoid update hook

Hi Dominic, On Wed, 11 Sep 2019, Dominic Winkler via GitGitGadget wrote: > From: Dominic Winkler > > A literal "{" should now be escaped in a pattern starting from perl > versions >= v5.26. In perl v5.22, using a literal { in a regular > expression was deprecated, and will emit a warning if it i

Re: [PATCH] completion: add missing completions for log, diff, show

Hi Max, The patch looks good to me! Thanks, Johannes On Wed, 11 Sep 2019, Max Rothman wrote: > On Thu, Aug 1, 2019 at 8:54 PM Max Rothman wrote: > > > > On Thu, Aug 1, 2019 at 8:50 PM Max Rothman wrote: > > > > > > The bash completion script knows some options to "git log" and > > > "git show

Re: could not fork child process rebasing required

Hi Sebastian, On Wed, 11 Sep 2019, Castro Alvarez, Sebastian wrote: > I have recently updated my computer to W10. So, I reinstalled the > newest version of Git, and it is not working. It gives the following > error: > > Error: Could not fork child process: Resource temporarily unavailable (-1). >

Re: [PATCH 1/1] Fix perl error "unescaped left brace in regex" for paranoid update hook

Hi Dominic, all looks good, with one exception: the Subject should start with `:`, i.e. in this instance something like this would be better: contrib/hooks: escape left brace in regex in the paranoid update hook Ciao, Johannes On Mon, 9 Sep 2019, Dominic Winkler via GitGitGadget wrote: > From:

Re: [PATCH 1/1] doc: small formatting fix

Hi Cameron, On Mon, 9 Sep 2019, Cameron Steffen via GitGitGadget wrote: > From: Cameron Steffen > > move an incorrectly placed backtick This sentence is incomplete, and does not really explain _why_ the backtick needs to be moved. Something like this would be much clearer: Most likely

Re: [PATCH 0/1] doc: small formatting fix

Hi Cameron, On Mon, 9 Sep 2019, Cameron Steffen via GitGitGadget wrote: > Edit: I need permission to submit please You got that permission already ;-) Ciao, Johannes > > Cameron Steffen (1): > doc: small formatting fix > > Documentation/pretty-formats.txt | 2 +- > 1 file changed, 1 inserti

Re: [PATCH] ci: install P4 from package to fix build error

Hi, On Tue, 10 Sep 2019, SZEDER Gábor wrote: > On Tue, Sep 10, 2019 at 12:51:01AM +0200, Johannes Schindelin wrote: > > On Fri, 6 Sep 2019, SZEDER Gábor wrote: > > > > > On Fri, Sep 06, 2019 at 12:27:11PM +0200, SZEDER Gábor wrote: > > > > > Let's ins

pd/fetch-jobs, was Re: What's cooking in git.git (Sep 2019, #01; Sat, 7)

Hi Junio, On Sat, 7 Sep 2019, Junio C Hamano wrote: > * pd/fetch-jobs (2019-08-13) 5 commits > . fetch: make --jobs control submodules and remotes > . fetch: add the --submodule-fetch-jobs option > . fetch: add the fetch.jobs config key > . fetch: add the "--fetch-jobs" option > . fetch: ren

Re: [PATCH v3 1/3] factor out refresh_and_write_cache function

Hi Thomas, On Fri, 6 Sep 2019, Thomas Gummerer wrote: > On 09/05, Junio C Hamano wrote: > > Thomas Gummerer writes: > > > > > Getting the lock for the index, refreshing it and then writing it is a > > > pattern that happens more than once throughout the codebase, and isn't > > > trivial to get r

Re: [PATCH] ci: install P4 from package to fix build error

Hi, On Fri, 6 Sep 2019, SZEDER Gábor wrote: > On Fri, Sep 06, 2019 at 12:27:11PM +0200, SZEDER Gábor wrote: > > To test 'git-p4' in the Linux Clang and GCC build jobs we used to > > install the 'p4' and 'p4d' binaries by directly downloading those > > binaries from a Perforce filehost. This has

Re: [PATCH v2 17/16] t3427: accelerate this test by using fast-export and fast-import

Hi Elijah, On Wed, 4 Sep 2019, Elijah Newren wrote: > fast-export and fast-import can easily handle the simple rewrite that > was being done by filter-branch, and should be faster on systems with a > slow fork. Measuring the overall time taken for all of t3427 (not just > the difference between

Re: [PATCH 2/2] compat/*.[ch]: remove extern from function declarations using spatch

Hi Denton, On Wed, 4 Sep 2019, Denton Liu wrote: > On Wed, Sep 04, 2019 at 11:43:06PM +0200, Johannes Schindelin wrote: > > > > On Wed, 4 Sep 2019, Denton Liu wrote: > > > > > In 554544276a (*.[ch]: remove extern from function declarations using > > > spatc

Re: [PATCH v2] rebase: introduce --update-branches option

Hi, On Mon, 9 Sep 2019, Phillip Wood wrote: > On 08/09/2019 00:44, Warren He wrote: > > Everyone in this thread, thanks for your support and encouragement. > > [...] > > > It should not really imply `--interactive`, but `--rebase-merges`. > > > > `imply_interactive` doesn't fully switch on `--int

[PATCH 0/1] Fix stale .gitignore change, introduced via js/visual-studio

As reported in https://public-inbox.org/git/20190825120741.gm20...@szeder.dev/, we added a line to ignore .manifest files, but that is a left-over from a long time ago, before we added and used compat/win32/git.manifest. This fixes that left-over. Johannes Schindelin (1): .gitignore: stop

[PATCH 1/1] .gitignore: stop ignoring `.manifest` files

From: Johannes Schindelin On Windows, it is possible to embed additional metadata into an executable by linking in a "manifest", i.e. an XML document that describes capabilities and requirements (such as minimum or maximum Windows version). These XML documents are expected to be

Re: [PATCH 2/2] compat/*.[ch]: remove extern from function declarations using spatch

Hi Denton, On Wed, 4 Sep 2019, Denton Liu wrote: > In 554544276a (*.[ch]: remove extern from function declarations using > spatch, 2019-04-29), we removed externs from function declarations using > spatch but we intentionally excluded files under compat/ since some are > directly copied from an u

Re: [PATCH 1/2] mingw: apply array.cocci rule

Hi Denton, On Wed, 4 Sep 2019, Denton Liu wrote: > After running Coccinelle on all sources inside compat/ that were created > by us[1], it was found that compat/mingw.c violated an array.cocci rule > in two places and, thus, a patch was generated. Apply this patch so that > all compat/ sources cr

[PATCH 0/1] Teach git reset to optionally read the pathspecs from stdin

Especially in 3rd-party tools, where the shape of the repository/worktree is unpredictable, it is a wise thing to have an option to pass pathspec parameters via stdin rather than via the command line, as the latter has size restrictions that the former does not have. Johannes Schindelin (1

[PATCH 1/1] reset: support the --stdin option

From: Johannes Schindelin Just like with other Git commands, this option makes it read the paths from the standard input. It comes in handy when resetting many, many paths at once and wildcards are not an option (e.g. when the paths are generated by a tool). Note: we first parse the entire list

Re: [PATCH v4 08/24] Ensure index matches head before invoking merge machinery, round N

Hi Elijah, On Tue, 3 Sep 2019, Johannes Schindelin wrote: > On Sat, 17 Aug 2019, Elijah Newren wrote: > > > * t3030-merge-recursive.h: this test has always been broken in that it > > didn't make sure to make index match head before running. But, it > > d

Re: [PATCH] rebase: introduce --update-branches option

Hi Warren, On Mon, 2 Sep 2019, Warren He wrote: > Rebasing normally updates the current branch to the rewritten version. > If any other branches point to commits rewritten along the way, those > remain untouched. This commit adds an `--update-branches` option, which > instructs the command to upd

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

Hi Junio, On Mon, 2 Sep 2019, Junio C Hamano wrote: > Phillip Wood writes: > > >>for (p1 = label.buf; *p1; p1++) > >> - if (isspace(*p1)) > >> + if (!(*p1 & 0x80) && !isalnum(*p1)) > >>*(char *)p1 = '-'; > > > > I'm sightl

Re: [PATCH v4 08/24] Ensure index matches head before invoking merge machinery, round N

Hi Elijah, On Sat, 17 Aug 2019, Elijah Newren wrote: > * t3030-merge-recursive.h: this test has always been broken in that it > didn't make sure to make index match head before running. But, it > didn't care about the index or even the merge result, just the > verbose output while

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

acters by dashes, but all non-alpha-numeric ones. > > > > However, we exempt non-ASCII UTF-8 characters from that, as it should be > > quite possible to reflect branch names such as `↯↯↯` in refs/file names. > > > > Signed-off-by: Matthew Rogers > > Signed-off-

Re: [PATCH v4 1/4] t6006: simplify and optimize empty message test

Hi Elijah, On Thu, 29 Aug 2019, Elijah Newren wrote: > Despite only being one piece of the 71st test and there being 73 tests > overall, this small change to just this one test speeds up the overall > execution time of t6006 (as measured by the best of 3 runs of `time > ./t6006-rev-list-format.sh

Re: [PATCH v4 2/4] t3427: accelerate this test by using fast-export and fast-import

Hi Elijah, On Thu, 29 Aug 2019, Elijah Newren wrote: > fast-export and fast-import can easily handle the simple rewrite that > was being done by filter-branch, and should be significantly faster on > systems with a slow fork. Timings from before and after on two laptops > that I have access to (

[PATCH 0/1] Make git rebase -r's label generation more resilient

Those labels must be valid ref names, and therefore valid file names. This just came in via Git for Windows. Matt R (1): rebase -r: let `label` generate safer labels sequencer.c | 12 +++- t/t3430-rebase-merges.sh | 5 + 2 files changed, 16 insertions(+), 1 deletion(

Re: [PATCH 03/11] hashmap_entry_init takes "struct hashmap_entry *"

Hi Eric, On Fri, 30 Aug 2019, Eric Wong wrote: > Johannes Schindelin wrote: > > > > On Tue, 27 Aug 2019, Derrick Stolee wrote: > > > > > On 8/25/2019 10:43 PM, Eric Wong wrote: > > > > C compilers do type checking to make life easier for u

Re: [RFC PATCH 0/5] Remove git-filter-branch from git.git; host it elsewhere

Hi Elijah, On Fri, 30 Aug 2019, Elijah Newren wrote: > On Fri, Aug 30, 2019 at 1:40 PM Johannes Schindelin > wrote: > > > [...] > > In my most recent instance of this, I wanted to publish the script I > > used to use for submitting patch series to the Git mailing lis

Re: [RFC PATCH 0/5] Remove git-filter-branch from git.git; host it elsewhere

Hi Elijah, On Wed, 28 Aug 2019, Elijah Newren wrote: > Hi Sergey, > > On Wed, Aug 28, 2019 at 1:52 AM Sergey Organov wrote: > > > > Elijah Newren writes: > > > > > On Tue, Aug 27, 2019 at 1:43 AM Sergey Organov wrote: > > >> > > >> Eric Wong writes: > > >> > > >> > > >> [...] > > >> > > >> >

Re: [PATCH] [PoC] A simpler find_unique_prefixes() implementation

Hi Gábor, On Wed, 28 Aug 2019, SZEDER Gábor wrote: > Implement find_unique_prefixes() by sorting the prefix items > lexicographically and then looking for unique prefixes in adjacent > pairs. It's definitely shorter than the current hashmap-based > implementation (101 vs 149 lines), subjectively

Re: git range-diff throws Segmentation fault

Hi Kasper, On Fri, 30 Aug 2019, van den Berg, Kasper wrote: > `git range-diff ` prints "segmentation fault" to the > console and nothing else. It happens in git version 2.23.0.windows.1 > and only occurs for some branches in my repository. Maybe you can come up with a Minimal, Complete and Ver

Re: [PATCH v5 2/2] am: reload .gitattributes after patching it

Hi brian, On Thu, 29 Aug 2019, brian m. carlson wrote: > On 2019-08-28 at 11:30:53, Johannes Schindelin wrote: > > > diff --git a/convert.c b/convert.c > > > index 94ff837649..0e6e9d2d75 100644 > > > --- a/convert.c > > > +++ b/convert.c > >

Re: [PATCH 1/1] git-p4: auto-delete named temporary file

Hi Junio, On Wed, 28 Aug 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Yes, this was me trying to re-send the patch via GMail's web UI because > > the first time GitGitGadget sent it, it did not get through (only the > > cover letter did). > &g

Re: [PATCH v3 01/11] Start to implement a built-in version of `git add --interactive`

Hi Junio, On Tue, 27 Aug 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Besides, I really hope that this would be only temporary,... > > Oh, no question about it. This should be temporary knob. > > I still do worry about giving a bad example for other

Re: [PATCH 04/11] hashmap_entry: detect improper initialization

Hi Junio, On Tue, 27 Aug 2019, Junio C Hamano wrote: > My plan is to have ew/hashmap topic for a few days while ejecting > the js/add-i topic which semantically conflicts with the changed way > hashmaps ought to be used temporarily, and when I have enough time > and concentration, try to see if I

Re: [PATCH 03/11] hashmap_entry_init takes "struct hashmap_entry *"

Hi Stolee, On Tue, 27 Aug 2019, Derrick Stolee wrote: > On 8/25/2019 10:43 PM, Eric Wong wrote: > > C compilers do type checking to make life easier for us. So > > rely on that and update all hashmap_entry_init callers to take > > "struct hashmap_entry *" to avoid future bugs while improving > >

Re: [PATCH v4 1/1] rebase.c: make sure the active branch isn't moved when autostashing

Hi Ben, On Mon, 26 Aug 2019, Ben Wijen wrote: > Dscho's review got me thinking about the rationale behind the 'HEAD is now > at...' > message. > > A 'stash push' is followed by a 'reset -q' but since 'stash create autostash' > is > not, we must do it ourselves. I guess the legacy implementation

Re: [PATCH 1/1] git-p4: auto-delete named temporary file

Hi Junio, On Mon, 26 Aug 2019, Junio C Hamano wrote: > Funny that the patch is line-wrapped, which I do not recall ever > seeing in GGG-generated e-mails. Dscho, do you know if anything > funny is going on? Yes, this was me trying to re-send the patch via GMail's web UI because the first time G

Re: [PATCH v2 20/23] .gitignore: touch up the entries regarding Visual Studio

Hi Gábor, On Mon, 26 Aug 2019, SZEDER Gábor wrote: > On Sun, Aug 25, 2019 at 11:21:23PM +0100, Philip Oakley wrote: > > diff --git a/.gitignore b/.gitignore > > index e096e0a51c..e7bb15d301 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -230,6 +230,7 @@ > > *.ip

Re: [PATCH v5 2/2] am: reload .gitattributes after patching it

Hi brian, [chiming in from the peanut gallery; if my comments don't make any sense, please do feel free to completely ignore me.] On Sun, 25 Aug 2019, brian m. carlson wrote: > diff --git a/convert.c b/convert.c > index 94ff837649..0e6e9d2d75 100644 > --- a/convert.c > +++ b/convert.c > @@ -8,6

Re: RFC: Proposing git-filter-repo for inclusion in git.git

Hi Elijah, On Fri, 23 Aug 2019, Elijah Newren wrote: > On Thu, Aug 22, 2019 at 8:01 PM Eric Wong wrote: > > > > Elijah Newren wrote: > > > * Remove git-filter-branch from git.git. Mention in the release > > > notes where people can go to get it.[1] > > > > > > filter-branch is not merely a s

[PATCH v4 00/11] git add -i: add a rudimentary version in C (supporting only status and help so far)

reusing the struct that is used for lookup also for adding the new item, and by strengthening the bug check. Daniel Ferreira (2): diff: export diffstat interface built-in add -i: implement the `status` command Johannes Schindelin (6): Start to implement a built-in version of `git add

[PATCH v4 04/11] built-in add -i: refresh the index before running `status`

From: Johannes Schindelin This is what the Perl version does, and therefore it is what the built-in version should do, too. Signed-off-by: Johannes Schindelin --- add-interactive.c | 4 +++- repository.c | 19 +++ repository.h | 7 +++ 3 files changed, 29

[PATCH v4 09/11] built-in add -i: support `?` (prompt help)

From: Johannes Schindelin With this change, we print out the same colored help text that the Perl-based `git add -i` prints in the main loop when question mark is entered. Signed-off-by: Johannes Schindelin --- add-interactive.c | 22 +- 1 file changed, 21 insertions(+), 1

[PATCH v4 05/11] built-in add -i: color the header in the `status` command

From: Johannes Schindelin For simplicity, we only implemented the `status` command without colors. This patch starts adding color, matching what the Perl script `git-add--interactive.perl` does. Original-Patch-By: Daniel Ferreira Signed-off-by: Slavica Djukic Signed-off-by: Johannes

[PATCH v4 01/11] Start to implement a built-in version of `git add --interactive`

From: Johannes Schindelin This is hardly the first conversion of a Git command that is implemented as a script to a built-in. So far, the most successful strategy for such conversions has been to add a built-in helper and call that for more and more functionality from the script, as more and

<    1   2   3   4   5   6   7   8   9   10   >