Hi Junio,
On Fri, 19 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > When building with certain build options, some commands are excluded
> > from the build. For exam
ngit.blob.core.windows.net/files/index.html that has the fix.
Ciao,
Johannes
> On Thu, Jan 10, 2019 at 10:55 AM Bret Barkelew wrote:
> >
> > On Thu, Jan 10, 2019 at 7:20 AM Johannes Schindelin
> > wrote:
> > >
> > > Hi Bret,
> > >
> > > in
Hi brian,
On Sat, 13 Apr 2019, brian m. carlson wrote:
> On Fri, Apr 12, 2019 at 09:51:02PM -0400, Jeff King wrote:
> > I wondered how you were going to kick this in, since users can define
> > arbitrary filters. I think it's kind of neat to automagically convert
> > "gzip -cn" (which also happen
Hi Peff,
On Mon, 15 Apr 2019, Jeff King wrote:
> On Sun, Apr 14, 2019 at 12:01:10AM +0200, René Scharfe wrote:
>
> > >> As we already link to the zlib library, we can perform the compression
> > >> without even requiring gzip on the host machine.
> > >
> > > Very cool. It's nice to drop a depende
Hi Peff,
On Fri, 12 Apr 2019, Jeff King wrote:
> On Fri, Apr 12, 2019 at 04:04:40PM -0700, Rohit Ashiwal via GitGitGadget
> wrote:
>
> > From: Rohit Ashiwal
> >
> > As we already link to the zlib library, we can perform the compression
> > without even requiring gzip on the host machine.
>
> Ve
Hi Junio,
On Sat, 13 Apr 2019, Junio C Hamano wrote:
> Jeff King writes:
>
> >> +/* writes out the whole block, or dies if fails */
> >> +static void write_block_or_die(const char *block) {
> >> + if (gzip) {
> >> + if (gzwrite(gzip, block, (unsigned) BLOCKSIZE) != BLOCKSIZE)
> >> +
Hi Peff,
On Fri, 12 Apr 2019, Jeff King wrote:
> On Fri, Apr 12, 2019 at 04:04:39PM -0700, Rohit Ashiwal via GitGitGadget
> wrote:
>
> > From: Rohit Ashiwal
> >
> > MinGit for Windows comes without `gzip` bundled inside, git-archive uses
> > `gzip -cn` to compress tar files but for this to work
Hi Julian,
On Wed, 27 Mar 2019, Julian Cheng wrote:
> I’m new here and hoping to get to be a part of GSOC 2019. I have questions
> about the main project and the microproject
>
> Main Project Quesctions
> I was hoping to work on “git revert --drop” and “git commit --reword”.
> Are there any ment
From: Johannes Schindelin
When building with certain build options, some commands are excluded
from the build. For example, `git-credential-cache` is skipped when
building with `NO_UNIX_SOCKETS`.
Let's not build or package documentation for those excluded commands.
This issue was pointe
From: Johannes Schindelin
The `git-remote-testgit` script is really only used in
`t5801-remote-helpers.sh`. It does not even contain any ``
placeholders that would need to be interpolated via `make
git-remote-testgit`.
Let's just move it to a new home, decluttering the top-level dire
From: Johannes Schindelin
The `git serve` built-in was introduced in ed10cb952d31 (serve:
introduce git-serve, 2018-03-15) as a backend to serve Git protocol v2,
probably originally intended to be spawned by `git upload-pack`.
However, in the version that the protocol v2 patches made it into
From: Johannes Schindelin
In preparation for moving `git serve` into `test-tool` (because it
really is only used by the test suite), we teach the `test-tool` the
useful trick to change the working directory before running the test
command, which will avoid introducing subshells in the test code
From: Johannes Schindelin
Among other things, the `check-docs` target ensures that
`command-list.txt` no longer contains commands that were dropped (or
that were never added in the first place).
To do so, it compares the list of commands from that file to the
commands listed in `$(ALL_COMMANDS
at I hoped would let me get away
with less work, I now imitate the logic of GIT-CFLAGS (and the resulting
patch is actually a lot easier to read).
Johannes Schindelin (8):
remote-testgit: move it into the support directory for t5801
Makefile: drop the NO_INSTALL variable
help -a: do no
From: Johannes Schindelin
The last user was just removed; There is no longer any need to carry it
around. Should we ever run into a need for it again, it is easy enough
to revert this commit.
It is unlikely, though, that we need `NO_INSTALL` again: as we saw with
the just-removed item, `git
From: Johannes Schindelin
When built with NO_CURL or with NO_UNIX_SOCKETS, some commands are
skipped from the build. It does not make sense to list them in the
output of `git help -a`, so let's just not.
Signed-off-by: Johannes Schindelin
---
Makefile| 14 --
gen
From: Johannes Schindelin
In the recent years, there has been a big push to convert more and more
of Git's commands that are implemented as scripts to built-ins written
in pure, portable C, for robustness, speed and portability.
One strategy that served us well is to convert those sc
Hi Eric & Junio,
On Mon, 15 Apr 2019, Eric Sunshine wrote:
> On Mon, Apr 15, 2019 at 12:16 AM Eric Sunshine
> wrote:
> > When composing that email, I originally wrote $(wildcard
> > config.mak.autogen) as the suggestion but changed it to the looser
> > $(wildcard config.mak*) when I realized th
Hi Peff,
On Mon, 15 Apr 2019, Jeff King wrote:
> On Mon, Apr 15, 2019 at 12:16:51AM -0400, Eric Sunshine wrote:
>
> > On Sun, Apr 14, 2019 at 11:10 PM Junio C Hamano wrote:
> > > Eric Sunshine writes:
> > > >> +Documentation/GIT-EXCLUDED-PROGRAMS: Makefile config.mak.uname
> > > >> + $(QU
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> > Subject: Re: [PATCH 3/7] check-docs: do not pretend that commands are
> > listed which are excluded
>
> Sorry
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The `git serve` built-in was introduced in ed10cb952d31 (serve:
> > introduce git-serve, 2018-0
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
> > $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
> &g
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > @@ -657,8 +656,6 @@ SCRIPT_PERL += git-svn.perl
> >
> > SCRIPT_PYTHON += git-p4.py
> >
> > -NO_INSTALL += git-remote-testgit
> >
Hi,
On Thu, 18 Apr 2019, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > On Thu, Apr 11, 2019 at 8:12 PM Nguyễn Thái Ngọc Duy
> > wrote:
> >>
> >> This is the companion of "git switch" and is based on that topic.
> >> This command peforms the "checkout paths" from git-checkout, git-reset
> >>
Hi,
On Thu, 18 Apr 2019, Junio C Hamano wrote:
> Jonathan Tan writes:
>
> > When "git branch -D " is run, Git usually first checks if that
> > branch is currently checked out. But this check is not performed if the
> > Git directory of that repository is not at "/.git", which is the
> > case if
Hi Drew,
On Tue, 16 Apr 2019, Drew DeVault wrote:
> Whenever I do a particularly long rebase on a branch, sorting out
> conflicts from upstream, I find that it's often useful to have the
> additional context that you get during an interactive rebase, such as
> recent commands run, commands planne
Hi Junio,
On Tue, 16 Apr 2019, Junio C Hamano wrote:
> * ab/test-lib-pass-trace2-env (2019-04-01) 1 commit
> (merged to 'next' on 2019-04-16 at 4dad6d6d7a)
> + test-lib: whitelist GIT_TR2_* in the environment
>
> Allow tracing of Git executable while running out tests.
Did you mean "our" ins
Hi Junio,
On Tue, 16 Apr 2019, Junio C Hamano wrote:
> * jc/format-patch-error-check (2019-02-22) 2 commits
> (merged to 'next' on 2019-04-10 at 6ca358b7ef)
> + format-patch: notice failure to open cover letter for writing
> + builtin/log: downcase the beginning of error messages
> (this bra
Hi,
On Wed, 17 Apr 2019, Junio C Hamano wrote:
> Phillip Wood writes:
>
> > Avoid this potential problem by removing the sequencer state if we're
> > committing or resetting the final pick in a sequence.
>
> The use-case story before this conclusion only mentioned "commit"
> that concluded the m
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Mon, 15 Apr 2019, Junio C Hamano wrote:
> >
> >> Junio C Hamano writes:
> >>
> >>
> >> > Do you mean more like
> >> > ...
> >
Hi Thomas,
On Mon, 15 Apr 2019, Thomas Gummerer wrote:
> On 04/15, Johannes Schindelin wrote:
>
> > On Sun, 14 Apr 2019, Eric Sunshine wrote:
> >
> > > On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer
> > > wrote:
> > > > [...]
> > > &
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin
> wrote:
> >
> > It seems not to have made it into the js/macos-gettext-build branch,
> > though. Would you terribly mind picking it up, please?
>
> I think
Hi Robin,
On Fri, 12 Apr 2019, Robin H. Johnson wrote:
> Looking at git-rebase--preserve-merges.sh for this message, I think that
> should be a separate patch to make it respect --quiet.
Please note that `git rebase --preserve-merges` will be deprecated as of
the next Git version (see https://gi
Hi Jonathan,
On Thu, 11 Apr 2019, Jonathan Nieder wrote:
> Jeff Hostetler wrote:
>
> > Initialize opts structure in repo_read_config().
>
> Good find.
Heh, it really was our CI that found it, and it was I (with valgrind's
help) who identified the problem and proposed the fix. So: thank you!
> I
Hi Duy,
On Sat, 13 Apr 2019, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/commit.h b/commit.h
> index 42728c2906..7342727e46 100644
> --- a/commit.h
> +++ b/commit.h
> @@ -143,9 +143,15 @@ void repo_unuse_commit_buffer(struct repository *r,
> struct object_id *get_commit_tree_oid(const struct comm
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>
> > Do you mean more like
> > ...
> > I think I can agree with either of the two positions...
>
> I am guessing from the earlier iteration that you wanted to say
> "unless it is given explicitly, we turn it on".
>
Hi Junio,
On Sun, 14 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index 562c57e685..f1a0fea4e1 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> >
Hi Eric,
On Sun, 14 Apr 2019, Eric Sunshine wrote:
> On Sun, Apr 14, 2019 at 5:10 PM Thomas Gummerer wrote:
> > [...]
> > Introduce a new range diff hunk header, that's enclosed by "##",
> > similar to how line numbers in diff hunks are enclosed by "@@", and
> > give human readable information o
Hi Eric,
On Sun, 14 Apr 2019, Eric Sunshine wrote:
> On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer wrote:
> > [...]
> > However it can still be useful to have the function name that 'git
> > diff' extracts as additional context for the change.
> > [...]
> > Signed-off-by: Thomas Gummerer
> >
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> When postprocessing the inner diff in range-diff, we currently replace
> the whole hunk header line with just "@@". This matches how 'git
> tbdiff' used to handle hunk headers as well.
>
> Most likely this is being done because line numbe
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> @@ -99,10 +90,10 @@ modified file Documentation/git-revert.txt
A better example might be a .c file, as the function name is often a
pretty useful piece of information.
Read: I think it should be part of the outer hunk header.
Also, t
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> Add the section headers we introduced in the previous commit to the
> outer diff's hunk headers. This makes it easier to understand which
> change we are actually looking at. For example an outer hunk header
> might now look like:
>
>
Hi Junio,
On Sat, 13 Apr 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > I'm not sure what the right solution for this is. I think one thing
> > I'd like range-diff to do is to add the filename, or some context
> > (e.g. is this part of the commit message etc.) to the @@ line (not
>
Hi Junio,
On Sun, 14 Apr 2019, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin
>
> Most notably, it seems that macOS' APFS does not allow that.
>
> Signed-off-by: Johannes Schindelin
This is actually a quite important fix, really, as it makes *eve
From: Johannes Schindelin
Due to reasons (some XCode versions seem to include gettext, some
don't?), Homebrew does not expose the libraries and headers in
/usr/local/ by default anymore.
Let's help find them again.
Note: for some reason, this is a change of behavior caused by the
flags explicitly. Maybe this is a gcc-8 only thing, as
it seems to have affected only the osx-gcc job, not the osx-clang job.
Changes since v1:
* Fix the tyop in the oneline of the first patch where it should talk about
ISO-8859-1.
Johannes Schindelin (2):
t9822: skip tests if file names cann
From: Johannes Schindelin
Most notably, it seems that macOS' APFS does not allow that.
Signed-off-by: Johannes Schindelin
---
t/t9822-git-p4-path-encoding.sh | 7 +++
1 file changed, 7 insertions(+)
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
Hi Luke,
On Sat, 13 Apr 2019, Luke Diamand wrote:
> On Fri, 12 Apr 2019 at 12:39, Johannes Schindelin via GitGitGadget
> wrote:
> >
> > From: Johannes Schindelin
> >
> > Most notably, it seems that macOS' APFS does not allow that.
>
> Did you mean in
When creating .tar.gz archives with git archive, we let gzip handle the
compression part. But that is not even necessary, as we already require zlib
(to compress our loose objects). It is also unfortunate, as it requires gzip
to be in the PATH (which is not the case e.g. with MinGit for Windows, w
Hi,
On Fri, 12 Apr 2019, SZEDER Gábor wrote:
> On Thu, Apr 11, 2019 at 10:58:57PM +0200, SZEDER Gábor wrote:
> > On Thu, Apr 11, 2019 at 10:51:46PM +0200, SZEDER Gábor wrote:
> > > On Wed, Apr 10, 2019 at 10:56:52PM +0200, Johanne
ose ends: after this, make check-docs
reports no issues on Windows.
Johannes Schindelin (7):
remote-testgit: move it into the support directory for t5801
help -a: do not list commands that are excluded from the build
check-docs: do not pretend that commands are listed which are excl
From: Johannes Schindelin
In preparation for moving `git serve` into `test-tool` (because it
really is only used by the test suite), we teach the `test-tool` the
useful trick to change the working directory before running the test
command, which will avoid introducing subshells in the test code
From: Johannes Schindelin
When building with certain build options, some commands are excluded
from the build. For example, `git-credential-cache` is skipped when
building with `NO_UNIX_SOCKETS`.
Let's not build or package documentation for those excluded commands.
This issue was pointe
From: Johannes Schindelin
When built with NO_CURL or with NO_UNIX_SOCKETS, some commands are
skipped from the build. It does not make sense to list them in the
output of `git help -a`, so let's just not.
Signed-off-by: Johannes Schindelin
---
Makefile| 14 --
gen
From: Johannes Schindelin
In the previous commit, we taught `git help -a` to stop listing commands
that are excluded from the build.
In this commit, we stop `check-docs` from claiming that those commands
are listed.
Signed-off-by: Johannes Schindelin
---
Makefile | 1 +
1 file changed, 1
From: Johannes Schindelin
In the recent years, there has been a big push to convert more and more
of Git's commands that are implemented as scripts to built-ins written
in pure, portable C, for robustness, speed and portability.
One strategy that served us well is to convert those sc
From: Johannes Schindelin
The `git-remote-testgit` script is really only used in
`t5801-remote-helpers.sh`. It does not even contain any ``
placeholders that would need to be interpolated via `make
git-remote-testgit`.
Let's just move it to a new home, decluttering the top-level dire
From: Johannes Schindelin
The `git serve` built-in was introduced in ed10cb952d31 (serve:
introduce git-serve, 2018-03-15) as a backend to serve Git protocol v2,
probably originally intended to be spawned by `git upload-pack`.
However, in the version that the protocol v2 patches made it into
From: Johannes Schindelin
Due to reasons (some XCode versions seem to include gettext, some
don't?), Homebrew does not expose the libraries and headers in
/usr/local/ by default anymore.
Let's help find them again.
Note: for some reason, this is a change of behavior caused by the
From: Johannes Schindelin
Most notably, it seems that macOS' APFS does not allow that.
Signed-off-by: Johannes Schindelin
---
t/t9822-git-p4-path-encoding.sh | 7 +++
1 file changed, 7 insertions(+)
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
flags explicitly. Maybe this is a gcc-8 only thing, as
it seems to have affected only the osx-gcc job, not the osx-clang job.
Johannes Schindelin (2):
t9822: skip tests if file names cannot be ISO-8895-1 encoded
macOS: make sure that gettext is found
config.mak.uname| 2 ++
t/
From: Johannes Schindelin
To use the singular form of a word, when the option wants the plural
form (and quietly expands it because it thinks it was abbreviated), is
an easy mistake to make, and t5317 contains almost two dozen of them.
However, using abbreviated options in tests is a bit
From: Johannes Schindelin
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However,
From: Johannes Schindelin
To avoid future ambiguities, we really want to use full option names in
the test suite. `t7525-status-rename.sh` used an abbreviated form of the
`--find-renames` option, though, so let's change that.
Signed-off-by: Johannes Schindelin
---
t/t7525-status-rename.s
commit message.
* Added a regression test for the GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
handling.
* Adjusted the code in test-lib.sh that makes sure that this variable is
set: it is now consistent with the way we do similar things in that file
already.
Johannes Schindelin (8):
tests (
From: Johannes Schindelin
This script used abbreviated options, which is unnecessarily fragile.
Signed-off-by: Johannes Schindelin
---
t/t7810-grep.sh | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 43aa4161cf
From: Johannes Schindelin
This test wants to run `git rebase` with the `--keep-empty` option, but
it really only spelled out `--keep` and trusted Git's option parsing to
determine that this was a unique abbreviation of the real option.
However, Denton Liu contributed a patch series in
From: Johannes Schindelin
In quite a few test cases, we were sloppy and used the abbreviation
`--force`, but we really should be precise in what we want to test.
Signed-off-by: Johannes Schindelin
---
t/t3415-rebase-autosquash.sh | 2 +-
t/t3430-rebase-merges.sh | 4 ++--
2 files changed
From: Johannes Schindelin
We really want to spell out the option in the full form, to avoid any
ambiguity that might be introduced by future patches.
Signed-off-by: Johannes Schindelin
---
t/t5516-fetch-push.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5516
From: Johannes Schindelin
It was probably just an oversight: the `--recurse-submodules` option
puts the term "submodules" in the plural form, not the singular one.
To avoid future problems in case that another option is introduced that
starts with the prefix `--recurse-submodule`,
Hi Junio,
On Mon, 1 Apr 2019, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> > I don't get why having a configuration option is better for defending
> > scripts against this problem than a simple environment variable. It
> > seems easier for the script prologue to contain:
> >
> > GIT_TES
Hi Ævar,
On Mon, 25 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
> On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
>
> > +# Disallow the use of abbreviated options in the test suite by default
> > +test -n "$GIT_TEST_DI
11:14:23AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > Git's command-line parsers support uniquely abbreviated options, e.g.
> > `git init --ba` would automatically expand `--ba` to `--bare`.
> >
> > This
ning low on
> > batteries only ran the rebase-related tests.
> >
> > On Mon, Mar 25, 2019 at 11:14:23AM -0700, Johannes Schindelin via
> > GitGitGadget wrote:
> >> From: Johannes Schindelin
> >> [...]
> >> @@ -325,6 +329,7 @@ file: (not se
Hi Thomas,
On Thu, 11 Apr 2019, Thomas Gummerer wrote:
> On 04/11, Duy Nguyen wrote:
> > Try
> >
> > git range-diff from...to
> >
> > with those two branches from https://gitlab.com/pclouds/git.git. The
> > interesting part is this
> >
> > diff --git a/Documentation/gitcli.txt b/Documen
Hi,
On Thu, 11 Apr 2019, Duy Nguyen wrote:
> On Thu, Apr 11, 2019 at 3:56 AM Johannes Schindelin
> wrote:
> > > @@
> > > + expression c;
> > > ++expression r;
> > > + expression s;
> > > + @@
> > > +-- get_com
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * jh/trace2-sid-fix (2019-04-01) 7 commits
> - trace2: make SIDs more unique
> - trace2: clarify UTC datetime formatting
> - trace2: report peak memory usage of the process
> - trace2: use system config for default trace2 settings
> - tr
Hi Phillip,
On Wed, 10 Apr 2019, Phillip Wood wrote:
> On 09/04/2019 19:08, Junio C Hamano wrote:
> > Here are the topics that have been cooking. Commits prefixed with
> > '-' are only in 'pu' (proposed updates) while commits prefixed with
> > '+' are in 'next'. The ones marked with '.' do not
Hi,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > On 04/10, Junio C Hamano wrote:
> >
> >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
> >> (merged to 'next' on 2019-04-10 at 9489a31a36)
> >> + stash: setup default diff output format if necessary
>
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * dl/warn-tagging-a-tag (2019-04-09) 2 commits
> - tag: advise on nested tags
> - tag: fix formatting
>
> "git tag" learned to give an advice suggesting it might be a
> mistake when creating an annotated or signed tag that points at
> an
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * nd/switch-and-restore (2019-04-02) 39 commits
> - doc: promote "git restore"
> - completion: support restore
> - SQUASH??? move -p test to 2071 from 2070
> - t: add tests for restore
> - restore: support --patch
> - restore: default t
Hi Duy,
On Sat, 6 Apr 2019, Nguyễn Thái Ngọc Duy wrote:
> 10: 68876a150f ! 11: 848456f59c commit.c: add repo_get_commit_tree()
> @@ -2,6 +2,11 @@
>
> commit.c: add repo_get_commit_tree()
>
> +Remove the implicit dependency on the_repository in this function.
> +It w
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
From: Johannes Schindelin
This imitates the code to show the help text from the Perl script
`git-add--interactive.perl` in the built-in version.
To make sure that it renders exactly like the Perl version of `git add
-i`, we also add a test case for that to `t3701-add-interactive.sh`.
Signed
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 | 24 +++-
1 file changed, 23 insertions
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
From: Johannes Schindelin
The reason why we did not start with the main loop to begin with is that
it is the first user of `list_and_choose()`, which uses the `list()`
function that we conveniently introduced for use by the `status`
command.
Apart from the "and choose" part, ther
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
sion of git add -i
into a built-in command.
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 --interactive`
built-in add -i: refresh the index before running `
; patch thicket is rebased onto core Git's four integration branches,
and when there are no merge conflicts to stop the rebase early, I got this
really obscure crash (no error message, no nothing to indicate what it was).
It cost me two full work days to chase this one down.
Johannes Schinde
From: Johannes Schindelin
In f9e6c649589e (untracked cache: load from UNTR index extension,
2015-03-08), code was added to read back the untracked cache from an
index extension.
Probably in the endeavor to avoid the `calloc()` implied by
`FLEX_ALLOC_STR()` (it is hard to know why exactly, the
didn't.
Johannes Schindelin (1):
t3301: fix false negative
t/t3301-notes.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
base-commit: 8104ec994ea3849a968b4667d072fedd1e688642
Published-As:
https://github.com/gitgitgadget/git/releases/tag/pr-176%2Fdscho%2Ffix-false-negati
From: Johannes Schindelin
In 6956f858f6 (notes: implement helpers needed for note copying during
rewrite, 2010-03-12), we introduced a test case that verifies that the
config setting `notes.rewriteRef` can be overridden via the environment
variable `GIT_NOTES_REWRITE_REF`.
Back when it was
Hi,
On Fri, 5 Apr 2019, Johannes Schindelin wrote:
> On Fri, 5 Apr 2019, Johannes Sixt wrote:
>
> > Am 05.04.19 um 19:25 schrieb Denton Liu:
> > > On Fri, Apr 05, 2019 at 04:55:37PM +0200, Johannes Schindelin wrote:
> > >> On Mon, 1 Apr 2019, Dento
Hi Jonathan,
On Fri, 5 Apr 2019, Jonathan Tan wrote:
> This is a fixup on the tip of jt/batch-fetch-blobs-in-diff (571debe1d9).
>
> I don't know if Junio has already merged this branch to next (he marked
> this as "Will merge to 'next'" in the "What's Cooking" email, but when I
> fetched, it hasn
Hi Junio,
On Thu, 4 Apr 2019, Junio C Hamano wrote:
> Christian Couder writes:
>
> > This path series is a follow up from the "remote odb" patch series
> > that I sent last year, which were a follow up from previous
> > series. See the links section for more information.
>
> When this topic gets
Hi Hannes & Denton,
On Fri, 5 Apr 2019, Johannes Sixt wrote:
> Am 05.04.19 um 19:25 schrieb Denton Liu:
> > On Fri, Apr 05, 2019 at 04:55:37PM +0200, Johannes Schindelin wrote:
> >> On Mon, 1 Apr 2019, Denton Liu wrote:
> >>> +test_rebase() {
>
that conversion is for
> already-long-gone code anyway. But yeah when you stack that conversion
> on top of this, it makes sense that we need double conversion to avoid
> build error.
>
> Since I will have to update this patch anyway, I'll update the commit
> message on the fir
git checkout master &&
> + git reset --hard E &&
> + git checkout side &&
> + git reset --hard G &&
> + git rebase $@ &&
I think we need this patch, to make the macOS build happy:
--
Hi Jonathan,
On Fri, 29 Mar 2019, Jonathan Tan wrote:
> When running a command like "git show" or "git diff" in a partial clone,
> batch all missing blobs to be fetched as one request.
>
> This is similar to c0c578b33c ("unpack-trees: batch fetching of missing
> blobs", 2017-12-08), but for anoth
901 - 1000 of 7666 matches
Mail list logo