On Wed, Aug 15, 2018 at 10:33 AM Johannes Schindelin via GitGitGadget
wrote:
> The `chainlint` target compares actual output to expected output, where
> the actual output is generated from files that are specifically checked
> out with LF-only line endings. So the expected output needs to be
>
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The `chainlint` target compares actual output to expected output, where
> the actual output is generated from files that are specifically checked
> out with LF-only line endings. So the expected output needs to be
>
On Tue, Aug 14, 2018 at 7:43 PM Derrick Stolee wrote:
> 2. Number of other commit tag-lines (Reviewed-By, Helped-By,
> Reported-By, etc.).
>
> Using git repo:
>
> $ git log --since=2018-01-01 junio/next|grep by:|grep -v
> Signed-off-by:|sort|uniq -c|sort -nr|head -n 20
>
> 66
--quit is supposed to be --abort but without restoring HEAD. Leaving
CHERRY_PICK_HEAD behind could make other commands mistake that
cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to
work). Clean it too.
For abort, this job of deleting CHERRY_PICK_HEAD is on "git reset" so
we
Signed-off-by: Nguyễn Thái Ngọc Duy
---
branch.c | 22 --
branch.h | 7 +--
builtin/am.c | 2 +-
builtin/branch.c | 6 --
builtin/checkout.c | 5 +++--
builtin/reset.c| 2 +-
6 files changed, 26 insertions(+), 18 deletions(-)
diff
Jeff King writes:
> Right, I'd agree they probably want the minimum for that traversal. And
> for `rev-list --filter`, that's probably OK. But keep in mind the main
> goal for --filter is using it for fetches, and many servers do not
> perform the traversal at all. Instead they use reachability
Matthew DeVore writes:
> Thank you. I changed it to this:
> awk -e "/tree|blob/{print \$1}" objs >trees_and_blobs
The "-e" option does not appear in
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/awk.html
and I think you can safely drop it from your command line.
If no -f
Elijah Newren writes:
>>
>> But please remind me not to merge this round down to 'next', for the
>> "enum" forward decl gotcha.
>
> I'll send out a new round shortly. Would you like me to squash the
> last patch (the one that had two hunks with minor conflicts with other
> topics in next and
On Wed, Aug 15, 2018 at 8:43 AM Junio C Hamano wrote:
> Elijah Newren writes:
>
> > On Tue, Aug 14, 2018 at 10:45 PM Junio C Hamano wrote:
> >> Elijah Newren writes:
> >>
> >> > On Mon, Aug 13, 2018 at 11:24 AM Junio C Hamano
> >> > wrote:
> >> >> Jeff King writes:
> >> >
> >> >> As things
Elijah Newren writes:
> On Tue, Aug 14, 2018 at 10:45 PM Junio C Hamano wrote:
>> Elijah Newren writes:
>>
>> > On Mon, Aug 13, 2018 at 11:24 AM Junio C Hamano wrote:
>> >> Jeff King writes:
>> >
>> >> As things are slowly moving out of the so-far kitchen-sink "cache.h"
>> >> into more
On Tue, Aug 14, 2018 at 11:51 PM Elijah Newren wrote:
> > [...]
> > >> enums are of unknown size, so forward declarations don't work for
> > >> them. See bb/pedantic for some examples.
> > >
> > > structs are also of unknown size; the size is irrelevant when the
> > > function signature merely
On Wed, Aug 15, 2018 at 1:20 AM Junio C Hamano wrote:
> Theoretically we should be able to make modules/kernel%2fv2.[24]
> additional "worktree"s of modules/kernel%2fv2.6, but given that
> these are all "bare" repositories without an attached working tree,
> I am not sure how that would supposed
Extend the NO_TCLTK=NoThanks flag to be understood by the
Documentation Makefile.
Before this change compiling and installing with NO_TCLTK would result
in no git-gui, gitk or git-citool being installed, but their
respective manual pages would still be installed.
Signed-off-by: Ævar Arnfjörð
From: Johannes Schindelin
The `chainlint` target compares actual output to expected output, where
the actual output is generated from files that are specifically checked
out with LF-only line endings. So the expected output needs to be
checked out with LF-only line endings, too.
Signed-off-by:
Historically, nobody paid attention to our own source code having correct
Git attributes
[https://www.edwardthomson.com/blog/git_for_windows_line_endings.html] when
it comes to line endings. Because historically, we had no good way to
specify that ;-)
But now we do, and so we need to use it.
On 8/10/2018 7:07 PM, Jeff King wrote:
The general idea is that accessing objects in packfile order is way
kinder to the delta base cache, and thus way more efficient. See patches
4 and 7 in particular for discussion and numbers.
I'm primarily interested in cat-file, so this series is focused
On 8/10/2018 7:15 PM, Jeff King wrote:
diff --git a/commit-graph.c b/commit-graph.c
index b0a55ad128..69a0d1c203 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -730,7 +730,7 @@ void write_commit_graph(const char *obj_dir,
die("error adding pack %s",
From: Samuel Maftoul
Add support for configuring default sort ordering for git branches. Command
line option will override this configured value, using the exact same
syntax.
---
Documentation/config.txt | 5 +
Documentation/git-branch.txt | 4
builtin/branch.c | 10
From: Phillip Wood
Commit e12a7ef597 ("rebase -i: Handle "combination of commits" with
GETTEXT_POISON", 2018-04-27) changed the way that individual commit
messages are labelled when squashing commits together. In doing so a
regression was introduced where the numbering of the messages is off by
From: Phillip Wood
Move the creation of conflicting-G from a test to the setup so that it
can be used in subsequent tests without creating the kind of implicit
dependencies that plague t3404. While we're at it simplify the
arguments to the test_commit() call the creates the conflicting commit.
From: Phillip Wood
As they fix a bug these patches are based on maint. Unfortunately
the second patch has semantic conflicts with master
s/git_path_merge_msg()/git_path_merge_msg(the_repository)/
There are additional textual conflicts with pu/next due to some
messages being marked for
From: Phillip Wood
If a merge command in the todo list specifies just a branch to merge
with no -C/-c argument then item->commit is NULL. This means that if
there are merge conflicts error_with_patch() is passed a NULL commit
which causes a segmentation fault when make_patch() tries to look it
On Wed, 2018-08-15 at 10:28 +0200, Joakim Tjernlund wrote:
> On Tue, 2018-08-14 at 16:20 -0700, Junio C Hamano wrote:
> > CAUTION: This email originated from outside of the organization. Do not
> > click links or open attachments unless you recognize the sender and know
> > the content is safe.
On Tue, 2018-08-14 at 16:20 -0700, Junio C Hamano wrote:
> CAUTION: This email originated from outside of the organization. Do not click
> links or open attachments unless you recognize the sender and know the
> content is safe.
>
>
> Junio C Hamano writes:
>
> > My understanding of what
Jeff King wrote:
> On Tue, Aug 14, 2018 at 12:47:59PM -0700, Stefan Beller wrote:
> > With the advent of public inbox, this is easy to obtain?
>
> For our project, yes. But I was thinking of a tool that could be used
> for other projects, too.
Nothing prevents public-inbox from being adopted by
On Tue, Aug 14, 2018 at 11:13 PM Jonathan Nieder wrote:
>
> Elijah Newren wrote:
>
> > I didn't want to repeat that description in all 6 patches, since all
> > six came from that, so I put it in the cover letter. Since patch #1
> > has most that changes though, I guess it makes sense to include
We use git for windows, there I cannot fin the git-submodule.sh! How can I fix
it there?
Gesendet: Dienstag, 14. August 2018 um 20:22 Uhr
Von: "Stefan Beller"
An: jochen.kueh...@gmx.de
Cc: git@vger.kernel.org, "Stefan Beller"
Betreff: [PATCH] git-submodule.sh: accept verbose flag in
Elijah Newren wrote:
> I didn't want to repeat that description in all 6 patches, since all
> six came from that, so I put it in the cover letter. Since patch #1
> has most that changes though, I guess it makes sense to include it at
> least in that one?
Yes, that sounds sensible to me.
[...]
101 - 128 of 128 matches
Mail list logo
