On Tue, Jan 29, 2019 at 03:27:32PM -0800, Jonathan Nieder wrote:
> Jonathan Tan wrote:
>
> > --- a/t/lib-httpd/apache.conf
> > +++ b/t/lib-httpd/apache.conf
> > @@ -78,6 +78,7 @@ PassEnv GNUPGHOME
> > PassEnv ASAN_OPTIONS
> > PassEnv GIT_TRACE
> > PassEnv GIT_CONFIG_NOSYSTEM
> > +PassEnv GIT_T
git developers:
Small feature request on:
git log --oneline -- ...
Could we add an option to:
1) display all commits in unconditionally
2) use a special marker (e.g. star) for commits that touch ...
and list the files from ... that this commit modified
Sample output:
git log --oneline (--annot
On Mon, Feb 11, 2019 at 11:59:00AM -0500, Randall S. Becker wrote:
> Hi All,
>
> I have localized the hang in t5562 (previous thread) to the
> invoke-with-content-length.pl script.
Hi.
I have not noticed the previous thread.
I have yet to look at it more closely, but there have been
one case of
On Fri, Feb 08, 2019 at 04:40:28PM -0500, Eric Sunshine wrote:
> The call to strbuf_init() is leaking the allocated strbuf buffer each
> time through the loop. The typical way to re-use a strbuf, and the way
> you should do it here, is strbuf_reset().
Thank you! Will fix it
On Mon, Feb 11, 2019 at 08:24:46PM +0100, Michael Haggerty wrote:
> The change to `write_with_updates()` doesn't only affect `pack-refs`.
> That function is also called when the `packed-refs` file has to be
> rewritten when a packed reference is deleted. This is another thing
> that you could test.
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarada...@gmail.com)
as i w
On Tue, Feb 12, 2019 at 12:24:40PM +0100, ism...@iodev.co.uk wrote:
> These bindings delete the word before and after the cursor
> respectively. It didn't seem necessary to describe the thing in detail
> because it has been commonplace for more than 30 years AFAICT.
I'm sure that these key binding
On Tue, Feb 12, 2019 at 12:08:01PM +0100, Ævar Arnfjörð Bjarmason wrote:
> Both this & the follow-up 29/31 look scary since this is an on-disk
> structure and this patch & the next one rather than implementing some
> transition, just changes the structs & code we use to read & write to
> use the cu
On Tue, Feb 12, 2019 at 06:33:39PM +0100, René Scharfe wrote:
> Am 12.02.2019 um 08:20 schrieb René Scharfe:
> > That command currently prints the pax comment in tar archives if it
> > looks like a SHA1 hash based on its length. It should continue to do
> > so, and _also_ show longer hashes. Your
On Tue, Feb 12, 2019 at 01:37:49AM -0500, Jeff King wrote:
> On Tue, Feb 12, 2019 at 01:22:29AM +, brian m. carlson wrote:
> > -static uint32_t find_object_pos(const unsigned char *sha1)
> > +static uint32_t find_object_pos(const unsigned char *hash)
>
> Isn't this really just a "struct object
On Mon, Feb 11, 2019 at 10:44:12PM -0500, Eric Sunshine wrote:
> On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson
> wrote:
> > Replace several uses of GIT_SHA1_HEXSZ and 40-based constants with
> > references to the_hash_algo. Update the note handling code here to
> > compute path sizes based on
On 02/11, SZEDER Gábor wrote:
> On Sun, Feb 10, 2019 at 10:17:12PM +, Thomas Gummerer wrote:
> > On 02/08, SZEDER Gábor wrote:
> > > On Thu, Dec 20, 2018 at 09:44:34PM +0200, Paul-Sebastian Ungureanu wrote:
> > > > Add stash push to the helper.
> > > >
> > > > Signed-off-by: Paul-Sebastian Ung
On Mon, Feb 11, 2019 at 6:50 PM Cameron Gunnin
wrote:
> The bug:
> cd unique-path-1
> git --git-dir=../worktree-test-repo/.git worktree add subdir branch1
> cd ../unique-path-2
> git --git-dir=../worktree-test-repo/.git worktree add subdir branch2
> # FAILS WITH: fatal: 'subdir' is a mis
Commits that make formatting changes or function renames are often not
interesting when blaming a file. A user may deem such a commit as 'not
interesting' and want to ignore and its changes it when assigning blame.
For example, say a file has the following git history / rev-list:
---O---A---X---
As preparation for changing all accesses to the todo array to use a
helper function, do the .done check in the loop body.
Signed-off-by: Rasmus Villemoes
---
builtin/grep.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 6c1e90d43b..21
Signed-off-by: Rasmus Villemoes
---
builtin/grep.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 211ae54222..92b9e6198d 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -93,18 +93,20 @@ static int skip_first_line;
stat
init_skiplist() took a file consisting of SHA-1s and comments and added
the objects to an oidset. This functionality is useful for other
commands.
Signed-off-by: Barret Rhoden
---
fsck.c | 37 +
oidset.c| 35 ++
The same code for splitting a blame_entry at a particular line was used
twice in blame_chunk(), and I'll use the helper again in an upcoming
patch.
Signed-off-by: Barret Rhoden
---
blame.c | 42 ++
1 file changed, 26 insertions(+), 16 deletions(-)
diff --
When ignoring commits, the commit that is blamed might not be
responsible for the change. Users might want to know when a particular
line has a potentially inaccurate blame.
This patch adds a config option to identify these lines by specifying
blame.markIgnoredFiles. When this option is set, eac
Signed-off-by: Barret Rhoden
---
t/t8013-blame-ignore-revs.sh | 199 +++
1 file changed, 199 insertions(+)
create mode 100755 t/t8013-blame-ignore-revs.sh
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
new file mode 100755
index
This patch set adds the ability to ignore a set of commits and their
changes when blaming. This can be used to ignore a commit deemed 'not
interesting,' such as reformatting.
v2 -> v3
v2: https://public-inbox.org/git/20190117202919.157326-1-b...@google.com/
- SHA-1 -> "object name", and fixed oth
We're only using 127 of the slots in todo[], which can easily be seen
by adding this hack
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -93,6 +93,8 @@ static int skip_first_line;
static void add_work(struct grep_opt *opt, const struct grep_source *gs)
{
+ static int count;
+
grep_l
In preparation for subsequent patches that make todo_* free-running
instead of reducing them mod TODO_SIZE, change their type to unsigned
to avoid undefined behaviour in case anybody ever greps more than 2
billion files.
Signed-off-by: Rasmus Villemoes
---
builtin/grep.c | 8
1 file cha
Use a helper for indexing into the todo array with any of the todo_*
variables, in preparation for not keeping those reduced mod TODO_SIZE.
Signed-off-by: Rasmus Villemoes
---
builtin/grep.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/grep.c b/builtin/
Background: I noticed that the condition in add_work() for when the
producer could add a new item was oddly different from the other
conditions on the todo_* bookkeeping variables - namely, in the other
cases we want todo_a != todo_b, whereas in add_work the condition is
todo_a+1!=todo_b. Another h
On 02/12, Christian Couder wrote:
> On Tue, Feb 12, 2019 at 9:25 PM Thomas Gummerer wrote:
> >
> > On 02/12, Christian Couder wrote:
>
> > > Yeah, using more of the libgit.a API, instead of the run_command API,
> > > and writing technical documentation on the stash commit format look
> > > like g
Awesome,
Do consider reading the files under Documentation (as other people
suggested) to make it easier to contribute. There's CodingGuidelines
and SubmittingPatches that are super useful :)
Good luck!
-Santiago.
On Tue, Feb 12, 2019 at 10:43:13PM +0100, Fabio Aiuto wrote:
> Ok I typed make ins
Ok I typed make install from the terminal, then I attached the the
project to the executable generated in the local bin directory. So I
can happily trace in the code. Thank you, hope I will be able to fix
things in git very soon!!!
Fabio.
Il giorno lun, 11/02/2019 alle 20.08 +0100, Fabio Aiuto ha s
Am 12.02.19 um 18:24 schrieb Junio C Hamano:
>>> diff --git a/t/t5562-http-backend-content-length.sh
>>> b/t/t5562-http-backend-content-length.sh
>>> @@ -143,14 +143,14 @@ test_expect_success GZIP 'push gzipped empty' '
>>> test_expect_success 'CONTENT_LENGTH overflow ssite_t' '
>>> NOT_F
On Tue, Feb 12, 2019 at 9:25 PM Thomas Gummerer wrote:
>
> On 02/12, Christian Couder wrote:
> > Yeah, using more of the libgit.a API, instead of the run_command API,
> > and writing technical documentation on the stash commit format look
> > like good ideas to me. I think I will add those items
On 02/12, Christian Couder wrote:
> On Mon, Feb 11, 2019 at 11:18 PM Thomas Gummerer wrote:
> >
> > On 02/11, Christian Couder wrote:
>
> > > Historically though we have always been very optimistic in what we
> > > thought a student could accomplish in a GSoC. And we are very likely
> > > to find
Junio C Hamano writes:
> If I find time later in the day, I may forge your sign-off and
> fabricate log messages for both patches, but unfortunately I need to
> run a long errand today during the day, so it may not happen.
And here is the other one. I have the s/is/if/ typofix already in there.
Junio C Hamano writes:
> If I find time later in the day, I may forge your sign-off and
> fabricate log messages for both patches, but unfortunately I need to
> run a long errand today during the day, so it may not happen.
Here is what I have, with forged sign-off. I am not merging them to
'nex
Junio C Hamano writes:
> Duy Nguyen writes:
>
>> The AIX problem is from d1dd94b308 (Do not print 'dangling' for
>> cat-file in case of ambiguity - 2019-01-17). Apparently AIX compiler
>> is a bit picky about enum being a strong or weak type. I like this
>> compiler. The below patch should do.
>
Duy Nguyen writes:
> The AIX problem is from d1dd94b308 (Do not print 'dangling' for
> cat-file in case of ambiguity - 2019-01-17). Apparently AIX compiler
> is a bit picky about enum being a strong or weak type. I like this
> compiler. The below patch should do.
That would cascade down the call
On 2/8/2019 6:53 PM, brian m. carlson wrote:
On Fri, Feb 08, 2019 at 02:51:13PM -0500, Ben Peart wrote:
From: Ben Peart
Add a post-indexchanged hook that is invoked after the index is written in
do_write_locked_index().
This hook is meant primarily for notification, and cannot affect
the o
Am 12.02.2019 um 08:20 schrieb René Scharfe:
> That command currently prints the pax comment in tar archives if it
> looks like a SHA1 hash based on its length. It should continue to do
> so, and _also_ show longer hashes. Your change makes it _only_ show
> those longer hashes.
>
> So it could ch
I forgot to mention that the issue is present both in maint and in the master
branch.
On Tue, Feb 12, 2019 at 06:19:52PM +0100, Giuseppe Crino' wrote:
> To reproduce, apply the attached patch and run at the project root
>
> cd t && ./t3700-add.sh --verbose-only=13 --debug --immediate
>
>
Eric Sunshine writes:
[jc: Summoning Dscho, J6t for their Windows expertise at the end]
> On Sat, Feb 9, 2019 at 1:59 PM wrote:
>> This change removes the dependency on /dev/zero with an equivalent pipe of
>
> Too many spaces between "equivalent" and "pipe".
>
>> deliberately NUL bytes. This a
To reproduce, apply the attached patch and run at the project root
cd t && ./t3700-add.sh --verbose-only=13 --debug --immediate
Relevant part of the output is
expecting success:
export GIT_ICASE_PATHSPECS=1 &&
touch a.if &&
test_mus
Eric Sunshine writes:
> On Sat, Feb 9, 2019 at 2:00 PM wrote:
>> This change removes the dependency on /dev/zero with generate_zero_bytes
>> appending NUL values to blocks generating wrong signatures for test cases.
>
> This commit message says what the patch does but not _why_. At
> minimum, it
Duy Nguyen writes:
> On Tue, Feb 12, 2019 at 01:13:35PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Thu, Feb 07 2019, Junio C Hamano wrote:
>>
>> > An early preview release Git v2.21.0-rc0 is now available for
>> > testing at the usual places. It is comprised of 426 non-merge
>> > commits s
Jeff King writes:
> In the feature that was eventually committed, "--date=auto" doesn't do
> anything. It was generalized to "--date=auto:".
>
> Signed-off-by: Jeff King
> ---
> Documentation/RelNotes/2.21.0.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks.
Duy Nguyen writes:
> So, how about something like this? A teeny bit longer than your
> version, but I think it's easier to control long term.
>
> -- 8< --
> diff --git a/Makefile b/Makefile
> index 0e13a5b469..44cfc63fc4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -433,6 +433,8 @@ all::
> #
>
Elijah Newren writes:
>> There is also another side fix in remove_split_index() that causes a
>> crash when doing "git update-index --no-split-index" when base_oid in
>> the index file is null. In this case we will not load
>> istate->split_index->base but we dereference it anyway and are rewarde
Hi Phillip,
Le 12/02/2019 à 11:52, Phillip Wood a écrit :
> Hi Alban
>
> I think this is almost there, I've got a couple of small comments below.
>
> On 10/02/2019 13:26, Alban Gruin wrote:
>> -%<-
>> diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
>> index df19ccaeb9.
git version 2.17.1
git-gui version 0.21.GITGUI
Steps to reproduce:
1) Open `git gui`
2) Select "Clone Existing Repository"
3) Set "Source Location" to an empty remote repository (I am trying
to clone from a gitolite "wild" repo that is created on the fly during
the clone).
4) Clone
Result:
fata
On Tue, Feb 12, 2019 at 8:45 PM Duy Nguyen wrote:
>
> On Fri, Feb 08, 2019 at 08:36:21PM -0600, Dan McGregor wrote:
> > Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR",
> > 2019-01-10) introduced an implicit assumption that rewind, fileno, and
> > fflush are functions. At least
On February 11, 2019 21:59, Junio C Hamano wrote:
> "Randall S. Becker" writes:
>
> >> In any case, no matter what POSIX says, if clearing .revents before
> > calling
> >> poll() helps on platforms in the real world, the patch is worth
> >> taking as
> > a fix, I
> >> would think.
> >
> > That's
On Fri, Feb 08, 2019 at 08:36:21PM -0600, Dan McGregor wrote:
> Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR",
> 2019-01-10) introduced an implicit assumption that rewind, fileno, and
> fflush are functions. At least on FreeBSD fileno is not, and as such
> passing a void * fai
On Tue, Feb 12, 2019 at 02:14:56PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Feb 12 2019, Duy Nguyen wrote:
>
> > On Tue, Feb 12, 2019 at 7:43 PM Duy Nguyen wrote:
> >> The test failures on NetBSD and Solaris/Sparc, not sure if we can do
> >> anything without test logs or access to these
Hello,
I want to understand if this behavior is as intended:
Suppose we have 3 branches A, B, C. A has common history with B and C (due to
previous merge, for example), while B and C have unrelated histories.
Doing regular simple merge from B into A and then from C into A works smoothly,
however
On Tue, Feb 12 2019, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Feb 12 2019, Duy Nguyen wrote:
>
>> On Tue, Feb 12, 2019 at 7:43 PM Duy Nguyen wrote:
>>> The test failures on NetBSD and Solaris/Sparc, not sure if we can do
>>> anything without test logs or access to these systems.
>>
>> Actually
On Tue, Feb 12 2019, Duy Nguyen wrote:
> On Tue, Feb 12, 2019 at 7:43 PM Duy Nguyen wrote:
>> The test failures on NetBSD and Solaris/Sparc, not sure if we can do
>> anything without test logs or access to these systems.
>
> Actually if you could tweak your ci script a bit to run tests with -v,
On Tue, Feb 12 2019, SZEDER Gábor wrote:
> On Tue, Feb 12, 2019 at 01:13:35PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> As seen on https://gitlab.com/git-vcs/git-ci/branches there are
>> regressions since 2.19.0, e.g. we have hard compile errors on BSD now,
>> and maybe AIX. I haven't dug into it
On Tue, Feb 12, 2019 at 7:43 PM Duy Nguyen wrote:
> The test failures on NetBSD and Solaris/Sparc, not sure if we can do
> anything without test logs or access to these systems.
Actually if you could tweak your ci script a bit to run tests with -v,
that would help.
--
Duy
On Tue, Feb 12, 2019 at 01:13:35PM +0100, Ævar Arnfjörð Bjarmason wrote:
> As seen on https://gitlab.com/git-vcs/git-ci/branches there are
> regressions since 2.19.0, e.g. we have hard compile errors on BSD now,
> and maybe AIX. I haven't dug into it.
Where exactly can we see those? Could you ple
On Tue, Feb 12, 2019 at 01:13:35PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Thu, Feb 07 2019, Junio C Hamano wrote:
>
> > An early preview release Git v2.21.0-rc0 is now available for
> > testing at the usual places. It is comprised of 426 non-merge
> > commits since v2.20.0, contributed by
On Thu, Feb 07 2019, Junio C Hamano wrote:
> An early preview release Git v2.21.0-rc0 is now available for
> testing at the usual places. It is comprised of 426 non-merge
> commits since v2.20.0, contributed by 57 people, 13 of which are
> new faces.
As seen on https://gitlab.com/git-vcs/git-c
Tested with the following versions of git:
* git version 2.17.2 (Apple Git-113) (macOS 10.14.3)
* git version 2.17.1 (Ubuntu 18.04.2 LTS)
--
Best,
Max
Hey there,
git-am seems to omit colons in the beginning of a subject line.
I have the following simple patch (just an example):
$ cat 0001-four-colons-prepended.patch
From e8213a2d10a61c9dc75521d88d656b8d5330e6bb Mon Sep 17 00:00:00 2001
From: Max Filenko
Date: Tue, 12 Feb 2019
On Tue, Feb 12 2019, brian m. carlson wrote:
> This is the sixteenth series of hash function transition patches. This
> series contains various fixes, mostly focused around the pack bitmap
> code, the HTTP code, the archive code, the index, and parts of our Perl
> code.
>
> This is the second to
On Tue, Feb 12 2019, brian m. carlson wrote:
> Switch two hard-coded uses of 20 to references to the_hash_algo.
>
> Signed-off-by: brian m. carlson
> ---
> pack-bitmap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pack-bitmap.c b/pack-bitmap.c
> index 6d6fa6856
On Tue, Feb 12 2019, brian m. carlson wrote:
> Change one hard-coded use of the constant 40 to a reference to
> the_hash_algo. In addition, switch a use of get_oid_hex to
> parse_oid_hex to avoid the need to use a constant.
>
> Signed-off-by: brian m. carlson
> ---
> remote-curl.c | 11 ++
On Tue, Feb 12 2019, brian m. carlson wrote:
> Instead of using a struct with a flex array member to read and write the
> untracked cache extension, use a shorter, fixed-length struct and add
> the name and hash data explicitly.
> [...]
> struct stat_data info_exclude_stat;
> struct
On Tue, Feb 12 2019, brian m. carlson wrote:
> The cat_blob function was matching on exactly 40 hex characters. This
> won't work with SHA-256, which uses 64-character hex object IDs. While
> it should be fine to simply match any number of hex characters since the
> output is space delimited,
On Tue, Feb 12 2019, brian m. carlson wrote:
> Gitweb has several hard-coded 40 values throughout it to check for
> values that are passed in or acquired from Git. To simplify the code,
> introduce a regex variable that matches either exactly 40 or exactly 64
> hex characters, and use this vari
Hi Alban
I think this is almost there, I've got a couple of small comments below.
On 10/02/2019 13:26, Alban Gruin wrote:
> This refactors sequencer_add_exec_commands() to work on a todo_list to
> avoid redundant reads and writes to the disk.
>
> Instead of inserting the `exec' commands between
On Mon, Feb 11, 2019 at 4:35 PM Jeff King wrote:
>
> Ah, doubly puzzling. It works fine in my Debian dash (but fnmatch was
> enabled in 0.5.8-1 there, too).
FWIW, it is reported by both checkbashisms and shellcheck if "linting"
could be considered of help to track these kind of issues.
other "po
On Thu, Feb 07, 2019 at 05:34:38PM -0500, Avery Pennarun wrote:
> But I don't see any major problems with the patch in this thread.
>
> Thanks!
>
> Avery
Hi Junio,
If there are no other comments, I think that this patch is ready to be
queued.
Thanks,
Denton
Thanks for the suggestion, Duy.
While I was fixing that up, I noticed a few other discrepancies so I
decided to fix those up too.
Changes since v1:
* Incorporate Duy's suggestion of "The default command is '...'"
* Fix additional discrepancies between git-remote and git-submodule (on the
submo
In git-remote.txt, the subcommands are underlined. Following that, we
also underline the subcommands in git-submodule.txt.
---
Documentation/git-submodule.txt | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-submodule.txt b/Documentation/git-
Instead of beating around the bush, we directly specify the subcommand
that is called by default when none are provided. This way, a user will
know where to look for more information.
---
Documentation/git-remote.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documenta
This patch documents the default behavior of submodule if no subcommands
are given, similar to how remote documents it in both git-remote.txt and
in its usage output.
Signed-off-by: Denton Liu
---
Documentation/git-submodule.txt | 4
git-submodule.sh| 3 ++-
2 files changed,
On Sat, Feb 09 2019, Nguyễn Thái Ngọc Duy wrote:
I ran into this bug in the past but wasn't able to reproduce it long
enough to track it down. Thanks for the fix.
It would be nice to have a test for it if it's easily narrowed down,
tricky edge cases we fix are worth testing for...
> I conside
On Tue, Feb 12 2019, Roman Gelfand wrote:
> At any one time, up to 3 developers could be developing hotfixes
> addressing issues.Whether it is one or multiple people working on
> hotfixes, we always want to produce one hotfix. Each hotfix is a
> cumulative update since beginning of release
On Mon, Feb 11, 2019 at 8:24 PM brian m. carlson
wrote:
> Instead of using get_oid_hex and adding constants to the result, use
> parse_oid_hex to make this code independent of the hash size.
>
> Signed-off-by: brian m. carlson
> ---
> diff --git a/builtin/difftool.c b/builtin/difftool.c
> @@ -65,
78 matches
Mail list logo
