On 30 August 2018 21:41:35 GMT+05:30, Elijah Newren wrote:
>That makes sense. I'm not sure I can concisely convey all the right
>points, but here's a stab at rewording:
>
>Recent addition of "directory rename" heuristics to the
>merge-recursive backend makes the command susceptible to false
'tis bug fix season! I admit, though, that this bug might be a bit too off
the trodden path to merit fast-tracking into v2.19.0.
While pairing with Jameson Miller to rebase Git for Windows to v2.19.0-rc1,
we had to fix a couple of commits which had somehow lost their proper
authorship (probably
From: Johannes Schindelin
When an interactive rebase was stopped at the end of a fixup/squash
chain, the user might have edited the commit manually before continuing
(with either `git rebase --skip` or `git rebase --continue`, it does not
really matter which).
We need to be very careful to wrap
From: Johannes Schindelin
The `git commit --squash` command can be used not only to amend commit
messages and changes, but also to record notes for an upcoming rebase.
For example, when the author information of a given commit is incorrect,
a user might call `git commit --allow-empty -m "Fix
On Fri, Aug 31, 2018 at 05:23:17PM +0200, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Aug 21 2018, Jeff King wrote:
>
> > +int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git,
> > +const unsigned char *sha1)
> > +{
> > + int pos;
> > +
> > + if
On Fri, Aug 31 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Fix up a logic error in 380efb65df ("push tests: assert re-pushing
>> annotated tags", 2018-07-31), where the $tag_type_description variable
>> was assigned to but never used, unlike in the subsequently added
>>
On 31/08/18 01:54, Jeff King wrote:
> On Fri, Aug 31, 2018 at 12:49:39AM +0100, Ramsay Jones wrote:
>
>> On 30/08/18 21:14, Junio C Hamano wrote:
>>> Jeff King writes:
>>>
I suppose so. I don't think I've _ever_ used distclean, and I only
rarely use "clean" (a testament to our
Jeff King writes:
> - make it clear to other observers that there's at least one person
> who hopes this is not the norm for this list
Make it at least two by counting me ;-)
> - make a general reminder that collaborating on the Internet is hard,
> but it's worth spending the extra
On Fri, Aug 31, 2018 at 11:14:20PM +0200, Johannes Schindelin wrote:
> On Fri, 31 Aug 2018, Junio C Hamano wrote:
> [...]
> > So instead of typing 3 lines, you can just say "yes we use echo that
> > emulates Unix".
>
> You could just express your gratitude that I do more than just answer a
>
Jeff King writes:
>> So instead of typing 3 lines, you can just say "yes we use echo that
>> emulates Unix".
>
> I actually found Dscho's response much more informative than a simple
> yes/no.
>
> At any rate, it sounds like we are probably OK with echo, but I think it
> is still worth doing the
Hi,
On Thu, 30 Aug 2018, Stefan Beller wrote:
> On Thu, Aug 30, 2018 at 12:20 PM Jeff King wrote:
> >
> > [...] Myers does not promise to find the absolute minimal diff. [...]
>
> The `Myers` (our default) diff algorithm is really the Myers algorithm +
> a heuristic that cuts off the long tail
On Fri, Aug 31, 2018 at 4:07 PM Jeff King wrote:
> On Fri, Aug 31, 2018 at 02:33:18AM -0400, Eric Sunshine wrote:
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > @@ -332,6 +332,7 @@ clean:
> > $(RM) manpage-base-url.xsl
> > + '$(SHELL_PATH_SQ)' ./doc-diff --clean
>
On Fri, Aug 31, 2018 at 4:01 PM Jeff King wrote:
> On Fri, Aug 31, 2018 at 02:33:17AM -0400, Eric Sunshine wrote:
> > OPTIONS_SPEC="\
> > doc-diff [options] [-- ]
> > +doc-diff (-c|--clean)
> > --
> > j=n parallel argument to pass to make
> > fforce rebuild; do not rely on cached
Hi Junio,
On Fri, 31 Aug 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Would "echo base >base" give us 5-byte long base even on Windows?
> >
> > Please note that Unix shell scripting is a foreign thing on Windows. As
> > such, there is not really any "native" shell we can
Ævar Arnfjörð Bjarmason writes:
> Fix up a logic error in 380efb65df ("push tests: assert re-pushing
> annotated tags", 2018-07-31), where the $tag_type_description variable
> was assigned to but never used, unlike in the subsequently added
> companion test for fetches in 2d216a7ef6 ("fetch
On Fri, Aug 31, 2018 at 1:00 PM Jonathan Nieder wrote:
> > From: Jonathan Nieder
> > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> > it unconditionally. However, recent versions do not need it, and its
> > presence results in compilation warnings. Resolve this issue by
On Fri, Aug 31, 2018 at 10:38:44PM +0200, Johannes Schindelin wrote:
> > > Is there any reason why you avoid using `git rebase -ir` here? This should
> > > be so much easier via
> > >
> > > git checkout pk/rebase-i-in-c-6-final
> > > git rebase -ir js/rebase-in-c-5.5-work-with-rebase-i-in-c^
Hi Peff,
On Thu, 30 Aug 2018, Jeff King wrote:
> On Thu, Aug 30, 2018 at 01:03:41PM +0200, Johannes Schindelin wrote:
>
> > > Will replace by doing:
> > >
> > > $ git checkout js/rebase-in-c-5.5-work-with-rebase-i-in-c
> > > $ git checkout HEAD^
> > > $ git am -s mbox
> > > $
Refer to the new git-push(1) documentation about when ref updates are
and aren't allowed with and without --force, noting how "git-fetch"
differs from the behavior of "git-push".
Perhaps it would be better to split this all out into a new
gitrefspecs(7) man page, or present this information using
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See
Fix up a logic error in 380efb65df ("push tests: assert re-pushing
annotated tags", 2018-07-31), where the $tag_type_description variable
was assigned to but never used, unlike in the subsequently added
companion test for fetches in 2d216a7ef6 ("fetch tests: add a test for
clobbering tag
The quoted -m'msg' option would mean the same as -mmsg when passed
through the test_force_push_tag helper. Let's instead use a string
with spaces in it, to have a working example in case we need to pass
other whitespace-delimited arguments to git-tag.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
The test suite only incidentally (and unintentionally) tested for the
current behavior of eager tag clobbering on "fetch". This is a
followup to 380efb65df ("push tests: assert re-pushing annotated
tags", 2018-07-31) which tests for it explicitly.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Saying that "git push :" won't push a merger of
and to is clear from the rest of the context here,
so mentioning it is redundant, furthermore the mention of "EXAMPLES
below" isn't specific or useful.
This phrase was originally added in 149f6ddfb3 ("Docs: Expand
explanation of the use of + in
Addresses Junio's comments to v4, and I had a few fixes of my own. I
don't know if this range-diff is more or less readble than just
re-reading it, but here goes:
1: d05fd561f3 = 1: d05fd561f3 fetch: change "branch" to "reference" in
--force -h output
-: -- > 2: 28275baca2 push
The -h output has been referring to the --force command as forcing the
overwriting of local branches, but since "fetch" more generally
fetches all sorts of references in all refs/ namespaces, let's talk
about forcing the update of a a "reference" instead.
This wording was initially introduced in
This change will be followed-up with a subsequent change where I'll
change both sides of this mention of "tag " to be something
that's best read without interruption.
To make that change smaller, let's move this mention of "tag " to
the end of the "..." section, it's now somewhere in the
middle.
There's complex rules governing whether a push is allowed to take
place depending on whether we're pushing to refs/heads/*, refs/tags/*
or refs/not-that/*. See is_branch() in refs.c, and the various
assertions in refs/files-backend.c. (e.g. "trying to write non-commit
object %s to branch '%s'").
On Fri, Aug 31, 2018 at 02:33:15AM -0400, Eric Sunshine wrote:
> This series replaces Peff's solo patch[1] which updates "make clean" to
> remove doc-diff's temporary directory. Rather than imbuing the Makefile
> with knowledge specific to doc-diff's internals, this series adds a
> "clean" mode
On Fri, Aug 31, 2018 at 02:33:18AM -0400, Eric Sunshine wrote:
> doc-diff creates a temporary working tree (git-worktree) and generates a
> bunch of temporary files which it does not remove since they act as a
> cache to speed up subsequent runs. Although doc-diff's working tree and
> generated
On Fri, Aug 31, 2018 at 02:33:17AM -0400, Eric Sunshine wrote:
> As part of its operation, doc-diff creates a bunch of temporary
> working files and holds onto them in order to speed up subsequent
> invocations. These files are never deleted. Moreover, it creates a
> temporary working tree (via
Elijah Newren writes:
>> Suggestions for a better rewrite is very much appreciated.
>
> That makes sense. I'm not sure I can concisely convey all the right
> points, but here's a stab at rewording:
>
> Recent addition of "directory rename" heuristics to the
> merge-recursive backend makes the
On Fri, Aug 31, 2018 at 02:33:16AM -0400, Eric Sunshine wrote:
> doc-diff invokes 'man' with the -l option to force "local" mode,
> however, neither MacOS nor FreeBSD recognize this option. On those
> platforms, if the argument to 'man' contains a slash, it is
> automatically interpreted as a
On Fri, Aug 31, 2018 at 08:33:26AM -0700, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Would "echo base >base" give us 5-byte long base even on Windows?
> >
> > Please note that Unix shell scripting is a foreign thing on Windows. As
> > such, there is not really any "native" shell
Hi Dscho,
On Fri, Aug 31, 2018 at 3:12 AM Johannes Schindelin
wrote:
> On Thu, 30 Aug 2018, Elijah Newren wrote:
> > On Tue, Aug 28, 2018 at 9:58 AM Junio C Hamano wrote:
> > > Elijah Newren writes:
...
> > > I'd say this is the only practical solution, before you deprecate
> > > the "pipe
Eric Sunshine writes:
> This series replaces Peff's solo patch[1] which updates "make clean" to
> remove doc-diff's temporary directory. Rather than imbuing the Makefile
> with knowledge specific to doc-diff's internals, this series adds a
> "clean" mode to doc-diff which removes its temporary
On Fri, Aug 31, 2018 at 2:21 PM Torsten Bögershausen wrote:
> > diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
> > @@ -14,11 +14,13 @@ compare_files () {
> > compare_ws_file () {
> > + tmp=$2.tmp
> > act=$pfx.actual.$3
> > - tr '\015\000abcdef0123456789'
On Fri, Aug 31, 2018 at 7:54 AM Ævar Arnfjörð Bjarmason
wrote:
> On Fri, Aug 31, 2018 at 11:52 AM Eric Sunshine
> wrote:
> > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> > it unconditionally. However, recent versions do not need it, and its
> > presence results in
On Wed, Aug 29, 2018 at 12:56:36AM +, brian m. carlson wrote:
> We transform various object IDs into all-zero object IDs for comparison.
> Adjust the length as well so that this works for all hash algorithms.
>
> Signed-off-by: brian m. carlson
> ---
> t/t0027-auto-crlf.sh | 6 --
> 1
Paul-Sebastian Ungureanu writes:
> This a new iteration of `stash.c`. What is new?
>
> * Some commits got squashed. The commit related to replacing
> `git apply` child process was dropped since it wasn't the best
> idea.
>
> * In v7, there was a bug [1] related to config `git stash show`
>
On Friday, August 31, 2018 9:54:50 AM MST Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
> >> Leave the setting of the commitable flag in show_merge_in_progress. If
> >> a check for merged commits is moved to the collect phase then other
> >> --dry-run tests fail.
>
> "Some tests fail"
On Friday, August 31, 2018 9:26:02 AM MST Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
> >
> > Ditto my comment on 1/3 on this. I.e. this changes the failing tests in
> > this series from 2 to 3.
>
> Correct. Thanks for helping Stephen on this topic.
I wasn't sure how this
On 8/31/2018 12:49 PM, Jeff Hostetler via GitGitGadget wrote:
+ if (tr2key_trace_want(_event)) {
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ if (ctx->nr_open_regions <= tr2env_event_depth_wanted) {
This should also compare to TR2_MAX_REGION_NESTING
On 8/31/2018 12:49 PM, Jeff Hostetler via GitGitGadget wrote:
This patch series contains a new trace2 facility that hopefully addresses
the recent trace- and structured-logging-related discussions. The intent is
to eventually replace the existing trace_ routines (or to route them to the
new
Eric Sunshine wrote:
> From: Jonathan Nieder
>
> OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> it unconditionally. However, recent versions do not need it, and its
> presence results in compilation warnings. Resolve this issue by defining
> OLD_ICONV only for older
Ævar Arnfjörð Bjarmason writes:
> On Fri, Aug 31 2018, Stephen P. Smith wrote:
>
>> In an update to fix a bug with "commit --dry-run" it was found that
>> the commitable flag was broken. The update was, at the time,
>> accepted as it was better than the previous version.
>
> What update is
From: Jeff Hostetler
Classify editory, pager, and sub-process child processes.
The former two can be used to identify interactive commands,
for example.
Signed-off-by: Jeff Hostetler
---
editor.c | 1 +
pager.c | 1 +
sub-process.c | 1 +
3 files changed, 3 insertions(+)
diff
From: Jeff Hostetler
Create trace2 API allowing event-based tracing. This will hopefully
eventually replace the existing trace API.
Create GIT_TR2 trace-key to replace GIT_TRACE, GIT_TR2_PERFORMANCE to
replace GIT_TRACE_PERFORMANCE, and a new trace-key GIT_TR2_EVENT to
generate JSON data for
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
read-cache.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 7b1354d759..7a31ac4da8 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1867,6 +1867,8 @@ static void tweak_split_index(struct
This patch series contains a new trace2 facility that hopefully addresses
the recent trace- and structured-logging-related discussions. The intent is
to eventually replace the existing trace_ routines (or to route them to the
new trace2_ routines) as time permits.
This draft adds new trace2_
From: Jeff Hostetler
Add trace2_region_enter() and _leave() around the entire preload_index()
call. Also add thread-specific events in the preload_thread() threadproc.
Signed-off-by: Jeff Hostetler
---
preload-index.c | 10 ++
1 file changed, 10 insertions(+)
diff --git
From: Jeff Hostetler
Add trace2_region_enter() and trace2_region_leave() calls around the
various phases of a status scan. This gives elapsed time for each
phase in the GIT_TR2_PERFORMANCE trace target.
Signed-off-by: Jeff Hostetler
---
wt-status.c | 14 --
1 file changed, 12
From: Jeff Hostetler
Add trace2_param() events in checkout to report whether the command
is switching branches or just checking out a file.
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c
From: Jeff Hostetler
Add trace2_region_enter() and _leave() calls inside read_directory_recursive()
to show nesting and per-level timing.
TODO Drop this commit or ifdef the calls. It generates too much data to
be in the production version. It is included in this patch series for
illustration
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
compat/mingw.h| 3 +--
git-compat-util.h | 7 +++
git.c | 9 -
repository.c | 2 ++
run-command.c | 8 +++-
run-command.h | 5 +
usage.c | 5 +
7 files changed, 35
On Fri, Aug 31, 2018 at 6:24 PM Junio C Hamano wrote:
>
> Ævar Arnfjörð Bjarmason writes:
>
> > On Thu, Aug 30 2018, Ævar Arnfjörð Bjarmason wrote:
> >
> > [Notes to self]
> > ...
> >
> > Later below this we say:
> >
> > Pushing an empty allows you to delete the ref from the
> > remote
Ævar Arnfjörð Bjarmason writes:
> On Fri, Aug 31 2018, Stephen P. Smith wrote:
>
>> Add test for commit with --dry-run --short for a new file of zero
>> length.
>>
>> The test demonstrated that the setting of the commitable flag was
>> broken as was found durning an earlier patch review.
>>
>>
Ævar Arnfjörð Bjarmason writes:
> On Thu, Aug 30 2018, Ævar Arnfjörð Bjarmason wrote:
>
> [Notes to self]
> ...
>
> Later below this we say:
>
> Pushing an empty allows you to delete the ref from the
> remote repository.
>
> Which, perhaps given the discussion of deletions as updates,
Johannes Schindelin writes:
>> Would "echo base >base" give us 5-byte long base even on Windows?
>
> Please note that Unix shell scripting is a foreign thing on Windows. As
> such, there is not really any "native" shell we can use [*1*], and
Yeah, I know that; otherwise I wouldn't have asked.
On Tue, Aug 21 2018, Jeff King wrote:
> +int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git,
> + const unsigned char *sha1)
> +{
> + int pos;
> +
> + if (!bitmap_git)
> + return 0; /* no bitmap loaded */
> + if
On Fri, Aug 31 2018, Wesley Schwengle wrote:
> Hop,
>
> 2018-08-30 16:45 GMT+02:00 Ævar Arnfjörð Bjarmason :
>
>>> Solution:
>>> We discussed this at work and we thought about making a .d directory
>>> for the hooks, eg. $GIT_DIR/hooks/post-commit.d, where a user can put
>>> the post-commit
On Fri, Aug 31, 2018 at 07:57:04AM -0400, Randall S. Becker wrote:
>
> On August 30, 2018 11:29 PM, Jonathan Nieder wrote:
> > Torsten Bögershausen wrote:
> >
> > > My original plan was to try to "make obsolete"/retire and phase out
> > > core.autocrlf completely.
> > > However, since e.g.
Hop,
2018-08-30 16:45 GMT+02:00 Ævar Arnfjörð Bjarmason :
>> Solution:
>> We discussed this at work and we thought about making a .d directory
>> for the hooks, eg. $GIT_DIR/hooks/post-commit.d, where a user can put
>> the post-commit hooks in. This allows us to provide post commit hooks
>> and
On August 30, 2018 11:29 PM, Jonathan Nieder wrote:
> Torsten Bögershausen wrote:
>
> > My original plan was to try to "make obsolete"/retire and phase out
> > core.autocrlf completely.
> > However, since e.g. egit/jgit uses it
> > (they don't have support for .gitattributes at all) I am not
On Fri, Aug 31, 2018 at 11:52 AM Eric Sunshine wrote:
> OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> it unconditionally. However, recent versions do not need it, and its
> presence results in compilation warnings. Resolve this issue by defining
> OLD_ICONV only for
Jonathan Nieder wrote:
> Eric Wong wrote:
> > Jonathan Nieder wrote:
> >> Jeff King wrote:
>
> >>> I guess I just wonder if I set up a mirror on another domain, would
> >>> anybody actually _use_ it? I'd think most people would just go to
> >>> public-inbox.org as the de facto URL.
> >>
> >> If
Hi everyone,
I was Outreachy intern last winter. I guess I need to speak up: I will
be happy if my feedback helps you.
At first, I want to repeat all thanks to Outreachy organizers and Git
mentors. That was unique experience and I am so proud of being a part
of this project. But, I need to say
Hi Elijah,
On Thu, 30 Aug 2018, Elijah Newren wrote:
> On Tue, Aug 28, 2018 at 9:58 AM Junio C Hamano wrote:
> >
> > Elijah Newren writes:
> >
> > > - Add a flag to turn off directory rename detection, and set the
> > > flag for every call from am.c in order to avoid problems like this.
> >
Hi Junio,
On Thu, 30 Aug 2018, Junio C Hamano wrote:
> Jeff King writes:
>
> > +test_expect_success \
> > +'apply delta with too many copied bytes' \
> > +'printf "\5\1\221\0\2" > too_big_copy &&
> > + echo base >base &&
> > + test_must_fail test-tool delta -p base too_big_copy
On Thu, Aug 30 2018, Piers Titus van der Torren wrote:
> Is there interest to incorporate this algorithm in the main git
> codebase? And if so, any hints on how to proceed?
This looks very nice, it would be great to have it in git. I think it's
more useful to focus on getting it into the git C
On Thu, Aug 30, 2018 at 7:22 PM, Stefan Beller wrote:
>
> AFAICT this is more than just a coloring scheme as it both produces
> a different low level diff, which would need code in the xdiff parts
> as well as colors, that is in diff.c.
About the low level diff, Michael Haggerty's tools for
On Thu, Aug 30, 2018 at 9:24 PM, Jeff King wrote:
> On Thu, Aug 30, 2018 at 01:46:00PM +0200, Johannes Schindelin wrote:
>
>> I am willing to mentor, and the only reason that kept me from already
>> stepping forward and trying to brush up the landing page is this concern:
>> traditionally, we (as
From: Jonathan Nieder
OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
it unconditionally. However, recent versions do not need it, and its
presence results in compilation warnings. Resolve this issue by defining
OLD_ICONV only for older FreeBSD versions.
Specifically,
Hi,
On Tue, Aug 28, 2018 at 5:14 PM, Jeff King wrote:
> The Outreachy application period is set to begin on September 10th for
> interns participating in the December-March program. Do we want to
> participate?
>
> Details on the program are here:
>
> https://www.outreachy.org/communities/cfp/
On Fri, Aug 31 2018, Stephen P. Smith wrote:
> In an update to fix a bug with "commit --dry-run" it was found that
> the commitable flag was broken. The update was, at the time,
> accepted as it was better than the previous version.
What update is this? I.e. git.git commit id? See the "or
On Fri, Aug 31 2018, Stephen P. Smith wrote:
> Add test for commit with --dry-run --short for a new file of zero
> length.
>
> The test demonstrated that the setting of the commitable flag was
> broken as was found durning an earlier patch review.
>
> Signed-off-by: Stephen P. Smith
> ---
>
On Fri, Aug 31 2018, Stephen P. Smith wrote:
> diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
> index 4cae92804..810d4cea7 100755
> --- a/t/t7501-commit.sh
> +++ b/t/t7501-commit.sh
> @@ -99,12 +99,12 @@ test_expect_success '--dry-run with stuff to commit
> returns ok' '
> git commit
This series replaces Peff's solo patch[1] which updates "make clean" to
remove doc-diff's temporary directory. Rather than imbuing the Makefile
with knowledge specific to doc-diff's internals, this series adds a
"clean" mode to doc-diff which removes its temporary worktree and
generated files, and
doc-diff creates a temporary working tree (git-worktree) and generates a
bunch of temporary files which it does not remove since they act as a
cache to speed up subsequent runs. Although doc-diff's working tree and
generated files are not strictly build products of the Makefile (which,
itself,
doc-diff invokes 'man' with the -l option to force "local" mode,
however, neither MacOS nor FreeBSD recognize this option. On those
platforms, if the argument to 'man' contains a slash, it is
automatically interpreted as a file specification, so a "local"-like
mode is not needed. And, it turns
As part of its operation, doc-diff creates a bunch of temporary
working files and holds onto them in order to speed up subsequent
invocations. These files are never deleted. Moreover, it creates a
temporary working tree (via git-wortkree) which likewise never gets
removed.
Without knowing the
81 matches
Mail list logo
