From: Issac Trotts
Make it possible to write for example
git log --format="%H,%S"
where the %S at the end is a new placeholder that prints out the ref
(tag/branch) for each commit.
Using %d might seem like an alternative but it only shows the ref for the last
commit in the branch.
Sig
On Tue, Jan 8, 2019 at 2:21 PM Junio C Hamano wrote:
>
> issac.tro...@gmail.com writes:
>
> > From: Issac Trotts
>
> Heh, I'll edit this line to match S-o-b: below.
Thanks. Otherwise I have to set up git send-email again on my work laptop.
> > Make it possible to write for example
> >
> >
Junio C Hamano 于2019年1月11日周五 上午5:11写道：
>
> Jiang Xin writes:
>
> > From: Jiang Xin
> > +create_commits()
> > +{
>
> Style (see Documentation/CodingGuidelines).
OK, parenthese after function name.
>
> > +create_pack_1()
> > +{
> > + P1=$(cd .git/objects/pack; printf "$T\n$A\n$B\n$C\n$D\n$E\n
On Thu, Jan 10, 2019 at 08:01:39PM +0800, Jiang Xin wrote:
> diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
> index cf9a9aabd4..3655cc7dc6 100644
> --- a/builtin/pack-redundant.c
> +++ b/builtin/pack-redundant.c
> @@ -446,49 +484,37 @@ static void minimize(struct pack_list **min)
On Thu, Jan 10, 2019 at 01:22:00PM -0800, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > On Thu, Dec 20 2018, SZEDER Gábor wrote:
> >
> >> When building Git with GCC 8.2.0 (at least from Homebrew on macOS,
> >> DEVELOPER flags enabled) one is greeted with a screenful of compiler
>
On Thu, Jan 10, 2019 at 01:40:31AM -0500, Jeff King wrote:
> On Thu, Jan 10, 2019 at 04:25:46AM +, brian m. carlson wrote:
>
> > There are a small number of places in our codebase where we cast a
> > buffer of unsigned char to a struct object_id pointer. When we have
> > GIT_MAX_RAWSZ set to 3
On Fri, Jan 11, 2019 at 3:07 AM Stefan Beller wrote:
>
> > I had a look at
> > https://gitlab.com/pclouds/git/commits/submodules-in-worktrees,
> > and it doesn't seem to be quite all okay.
> >
> > The submodule update step of the repro (that breaks the config on 2.20)
> > emits
> > an error mess
On Thu, Jan 10, 2019 at 01:49:45AM -0500, Jeff King wrote:
> This one really is a hashcpy() now, right, even after your final patch?
> I guess using rawsz explicitly makes it match the computation here:
>
> > @@ -107,7 +108,7 @@ static void entry_extract(struct tree_desc *t, struct
> > name_entry
On Thu, Jan 10, 2019 at 01:45:20AM -0500, Jeff King wrote:
> On Thu, Jan 10, 2019 at 04:25:49AM +, brian m. carlson wrote:
> > diff --git a/match-trees.c b/match-trees.c
> > index feca48a5fd..b1fbd022d1 100644
> > --- a/match-trees.c
> > +++ b/match-trees.c
> > @@ -224,7 +224,7 @@ static int sp
On Thu, Jan 10, 2019 at 11:36 AM Jonathan Tan wrote:
>
> When fetching using protocol v2, the remote may send a "shallow-info"
> section if the client is shallow. If so, Git as the client currently
> takes the shallow file lock, even if the "shallow-info" section is
> empty.
>
> This is not a prob
Masaya Suzuki writes:
> Diff from v3[1]:
>
> * Handle ftruncate and fflush return values
> * Call rewind to set the position back
>
> [1]:
> https://public-inbox.org/git/20190108024741.62176-1-masayasuz...@google.com/
Thanks. Adding the error checking even to 1/5 and moving the
updated cod
Jonathan Tan writes:
>> > This, when applied on top of ecbdaf08991, seems to break t5702.30,
>> > at least for me.
>> >
>> > Tip of 'pu' in today's push-out will be broken as it has this patch
>> > merged.
>> >
>> > Can somebody take a look?
>>
>> I can reproduce this. I'll investigate this fu
Barret Rhoden writes:
> For instance, commit X does this:
>
> -foo(x,y);
> +foo(x,y,z);
>
> Then commit Y comes along to reformat it:
>
> -foo(x,y,z);
> +foo(x, y, z);
>
> And the history / rev-list for the file looks like:
>
> ---O---A---X---B---C---D---Y---E---F
>
> I want to ignore/skip Y and
Jeff King writes:
> But does this catch all of the limiting that git-log would do? I notice
> that it happens before the call to log_tree_diff(), which conditionally
> returns a "shown" flag. So you get weird results with some options. For
> example:
>
> # works, because pathspec limiting happe
> > This, when applied on top of ecbdaf08991, seems to break t5702.30,
> > at least for me.
> >
> > Tip of 'pu' in today's push-out will be broken as it has this patch
> > merged.
> >
> > Can somebody take a look?
>
> I can reproduce this. I'll investigate this further. In the meantime,
> feel f
On Jan 10, 2019 at 10:26, Junio C Hamano wrote:
Samir Benmendil writes:
It is impossible to run git commands affecting a different repo from
within a `git rebase --exec` because in that environment the `GIT_DIR`
and `GIT_WORK_TREE` variables are set and inherited by any commands
run as part of
On 07/01/2019 19:04, Junio C Hamano wrote:
nbelakov...@gmail.com writes:
From: Nickolai Belakovski
In order to more clearly display which branches are active, the output
of git branch is modified to mark branches checkout out in a linked
worktree with a "+" and color them in cyan (in contrast
Nguyễn Thái Ngọc Duy writes:
> This function has both $GIT_COMMON_DIR and $GIT_DIR in "opts". Use it
> to construct config.worktree path instead because git_pathdup() is
> tied to the current worktree, but the given $GIT_DIR could be from
> another one.
Given that git_pathdup() does
do
Robin Shen wrote:
> Yes it is using JGit for most operations. JGit API is very well
> designed and is a joy to use. The performance is very good, except
> for long operations such as full clone. So for pull/push I am
> calling native git, but for other operations which may need to be
> executed se
> Junio C Hamano writes:
>
> > Josh Steadmon writes:
> >
> >> Looks good to me.
> >> Reviewed-by: Josh Steadmon
> >
> > Thanks, both.
>
> This, when applied on top of ecbdaf08991, seems to break t5702.30,
> at least for me.
>
> Tip of 'pu' in today's push-out will be broken as it has this pat
Ævar Arnfjörð Bjarmason writes:
> On Thu, Dec 20 2018, SZEDER Gábor wrote:
>
>> When building Git with GCC 8.2.0 (at least from Homebrew on macOS,
>> DEVELOPER flags enabled) one is greeted with a screenful of compiler
>> errors:
>>
>> compat/obstack.c: In function '_obstack_begin':
>> compat
Jiang Xin writes:
> From: Jiang Xin
>
> Add test cases for git pack-redundant to validate new algorithm for git
> pack-redundant.
>
> Signed-off-by: Jiang Xin
> Reviewed-by: SZEDER Gábor
> ---
> t/t5323-pack-redundant.sh | 157 ++
> 1 file changed, 157 inse
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> On Windows, files cannot be removed nor renamed if there are still
> handles held by a process. To remedy that, we introduced the
> close_all_packs() function.
>
> Earlier, we made sure that the packs are released jus
Junio C Hamano writes:
> Josh Steadmon writes:
>
>> Looks good to me.
>> Reviewed-by: Josh Steadmon
>
> Thanks, both.
This, when applied on top of ecbdaf08991, seems to break t5702.30,
at least for me.
Tip of 'pu' in today's push-out will be broken as it has this patch
merged.
Can somebody t
> I had a look at
> https://gitlab.com/pclouds/git/commits/submodules-in-worktrees,
> and it doesn't seem to be quite all okay.
>
> The submodule update step of the repro (that breaks the config on 2.20) emits
> an error message instead, and leaves the config unchanged:
>git -C b2 submodule up
On Thu, Jan 10, 2019 at 08:01:41PM +0800, Jiang Xin wrote:
> diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
> index 56591d283f..e9d2586e2e 100644
> --- a/builtin/pack-redundant.c
> +++ b/builtin/pack-redundant.c
> @@ -421,16 +422,22 @@ static inline off_t pack_set_bytecount(struc
Jeff King writes:
> On Mon, Jan 07, 2019 at 03:34:10PM -0800, Junio C Hamano wrote:
>
>> * jk/proto-v2-hidden-refs-fix (2018-12-14) 3 commits
>> - upload-pack: support hidden refs with protocol v2
>> - parse_hide_refs_config: handle NULL section
>> - serve: pass "config context" through to ind
When fetching using protocol v2, the remote may send a "shallow-info"
section if the client is shallow. If so, Git as the client currently
takes the shallow file lock, even if the "shallow-info" section is
empty.
This is not a problem except that Git does not support taking the
shallow file lock a
This tests GIT_CURL_VERBOSE shows an error when an URL returns 500. This
exercises the code in remote_curl.
Signed-off-by: Masaya Suzuki
---
t/lib-httpd/apache.conf | 1 +
t/t5581-http-curl-verbose.sh | 28
2 files changed, 29 insertions(+)
create mode 100755
In order to pass more values for rpc_in, define a struct and pass it as
an additional value.
Signed-off-by: Masaya Suzuki
---
remote-curl.c | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index d8eda2380a..d4673b6e8c 100644
--
By not setting CURLOPT_FAILONERROR, curl parses the HTTP response
headers even if the response is an error. This makes GIT_CURL_VERBOSE to
show the HTTP headers, which is useful for debugging.
Signed-off-by: Masaya Suzuki
---
remote-curl.c | 10 ++
1 file changed, 10 insertions(+)
diff
HTTP_KEEP_ERROR makes it easy to debug HTTP transport errors. In order
to make HTTP_KEEP_ERROR enabled for all requests, file handles need to
be supported.
Signed-off-by: Masaya Suzuki
---
http.c | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/http.c b/http.
Diff from v3[1]:
* Handle ftruncate and fflush return values
* Call rewind to set the position back
[1]:
https://public-inbox.org/git/20190108024741.62176-1-masayasuz...@google.com/
Masaya Suzuki (5):
http: support file handles for HTTP_KEEP_ERROR
http: enable keep_error for HTTP reques
curl stops parsing a response when it sees a bad HTTP status code and it
has CURLOPT_FAILONERROR set. This prevents GIT_CURL_VERBOSE to show HTTP
headers on error.
keep_error is an option to receive the HTTP response body for those
error responses. By enabling this option, curl will process the HT
Jeff King writes:
> On Mon, Jan 07, 2019 at 03:34:10PM -0800, Junio C Hamano wrote:
>
>> * jk/proto-v2-hidden-refs-fix (2018-12-14) 3 commits
>> - upload-pack: support hidden refs with protocol v2
>> - parse_hide_refs_config: handle NULL section
>> - serve: pass "config context" through to ind
On Thu, 10 Jan 2019 at 02:03, brian m. carlson
wrote:
>
> On Wed, Jan 09, 2019 at 10:06:08PM +0100, Martin Ågren wrote:
> > i.e., we copy sizeof(struct object_id) (=32) bytes. Which is 12 more
> > than what is known to be safe. For this particular input data, we read
> > outside allocated memory.
On Thu, Jan 10, 2019 at 7:20 AM Johannes Schindelin
wrote:
>
> Hi Bret,
>
> in that case, please try to find a way to trace the commands in a Tcl/Tk
> program (which gitk is) and see which command triggers the error.
Er... that's a little out of my depth. I'll see if I can find time to learn.
Mea
"brian m. carlson" writes:
>> I can think of three possible approaches:
>>
>> * Allocate with a margin (GIT_MAX_RAWSZ - the_hash_algo->rawsz) where
>> "necessary" (TM). Maybe not so maintainable.
>
> I think there are actually several places where we allocate for these
> buffers, so this is no
Stefan Beller writes:
> On Tue, Jan 8, 2019 at 10:31 AM Junio C Hamano wrote:
>>
>> Phillip Wood writes:
>>
>> > I just wanted to check that these patches are on your radar as they
>> > haven't made it into pu yet.
>>
>> Sorry, but they were not on my radar. I was waiting for comments to
>> co
Josh Steadmon writes:
> Looks good to me.
> Reviewed-by: Josh Steadmon
Thanks, both.
Eric Sunshine writes:
> However, you might also consider using xstrdup_or_null(), like this:
>
> external_diff_cmd = xstrdup_or_null(getenv(...));
> if (!external_diff_cmd)
> ...as before...
>
>> done_preparing = 1;
>> return external_diff_cmd;
>> }
Looks good.
Samir Benmendil writes:
> It is impossible to run git commands affecting a different repo from
> within a `git rebase --exec` because in that environment the `GIT_DIR`
> and `GIT_WORK_TREE` variables are set and inherited by any commands
> run as part of `git rebase --exec`.
If the user wants to
Оля Тележная writes:
> Just fixed 1 cast from (intmax_t) to (uintmax_t).
Thanks.
As the previous one already is in 'next', let's queue this on top of
it instead.
-- >8 --
Subject: [PATCH] ref-filter: give uintmax_t to format with %PRIuMAX
As long as we are casting to a wider type, we should
SZEDER Gábor writes:
> On Wed, Jan 09, 2019 at 07:21:16AM -0800, Derrick Stolee via GitGitGadget
> wrote:
>> The 'git multi-pack-index expire' command ...
>
> The subject line could use a s/verb/subcommand/.
Yeah, that probably is more in line with the existing terminology
for other Git command
> * sb/submodule-recursive-fetch-gets-the-tip (2018-12-09) 9 commits
> - fetch: ensure submodule objects fetched
> - submodule.c: fetch in submodules git directory instead of in worktree
> - submodule: migrate get_next_submodule to use repository structs
> - repository: repo_submodule_init to t
Anthony Sottile writes:
> Minimal reproduction
>
> ```
> git init t
> git -C t commit --allow-empty -m 'initial commit'
> touch t/a
> git -C t add --intent-to-add a
> git -C t stash
> ```
>
> ```
> + git init t
> Initialized empty Git repository in /private/tmp/t/t/.git/
> + git -C t commit --all
SZEDER Gábor writes:
>> Without `-E`, MasOS has to write two seperate sed commands, such as:
>>
>> git pack-redundant --all >out &&
>> sed -e "s#.*/pack-\(.*\)\.idx#\1#" out | \
>> sed -e "s#.*/pack-\(.*\)\.pack#\1#"
Two commands, perhaps, but does it have to be two separate sed
pro
It is impossible to run git commands affecting a different repo from
within a `git rebase --exec` because in that environment the `GIT_DIR`
and `GIT_WORK_TREE` variables are set and inherited by any commands run
as part of `git rebase --exec`.
A minimal reproduction is shown below:
git ini
On Thu, Jan 10, 2019 at 7:21 AM Johannes Schindelin
wrote:
>
> Hi Anthony,
>
> On Wed, 9 Jan 2019, Anthony Sottile wrote:
>
> > On Wed, Jan 9, 2019 at 10:25 AM Johannes Schindelin
> > wrote:
> > >
> > > On Thu, 3 Jan 2019, Anthony Sottile wrote:
> > >
> > > > Minimal reproduction
> > > >
> > > >
Hi,
On Wed, 9 Jan 2019, Eric Sunshine wrote:
> On Wed, Jan 9, 2019 at 5:19 PM Kim Gybels wrote:
> > According to getenv(3)'s notes:
> > [...]
> > Since strings returned by getenv() are allowed to change on subsequent
> > calls to getenv(), make sure to duplicate when caching external_diff_cmd
>
Hi Anthony,
On Wed, 9 Jan 2019, Anthony Sottile wrote:
> On Wed, Jan 9, 2019 at 10:25 AM Johannes Schindelin
> wrote:
> >
> > On Thu, 3 Jan 2019, Anthony Sottile wrote:
> >
> > > Minimal reproduction
> > >
> > > ```
> > > git init t
> > > git -C t commit --allow-empty -m 'initial commit'
> > > t
Hi Bret,
in that case, please try to find a way to trace the commands in a Tcl/Tk
program (which gitk is) and see which command triggers the error.
Ciao,
Johannes
On Wed, 9 Jan 2019, Bret Barkelew wrote:
> Will try to reply in-line, when appropriate.
> The latest snapshot (git version 2.20.1.w
Hey Jeff!
On Sun, Jan 6, 2019 at 7:50 AM Jeff King wrote:
>
> On Sat, Jan 05, 2019 at 04:50:30PM +0100, Michal Novotny wrote:
>
> > I could potentially make it so that I tag subtrees instead of commits
> > and then derive the needed information from these subtree tags. This
> > could be useful if
On 10.01.19 12:57, SZEDER Gábor wrote:
> On Thu, Jan 10, 2019 at 11:28:34AM +0800, Jiang Xin wrote:
>> SZEDER Gábor 于2019年1月9日周三 下午8:56写道：
+ sed -e "s#^.*/pack-\(.*\)\.\(idx\|pack\)#\1#g" | \
>>>
>>> This sed command doesn't seem to work on macOS (on Travis CI), and
>>> causes the
> Sun Chao (my former colleague at Huawei) found a bug of
> git-pack-redundant. If there are too many packs and many of them
> overlap
> each other, running `git pack-redundant --all` will exhaust all memories
> and the process will be killed by kernel.
>
> There is a script in commit log of comm
From: Jiang Xin
SZEDER reported that test case t5323 has different test result on MacOS.
This is because `cmp_pack_list_reverse` cannot give identical result
when two pack being sorted has the same size of remaining_objects.
Changes to the sorting function will make consistent test result for
t5
From: Jiang Xin
New algorithm uses `pack_list.all_objects` to track remaining objects,
so rename it to `pack_list.remaining_objects`.
Signed-off-by: Jiang Xin
---
builtin/pack-redundant.c | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git
From: Sun Chao
Remove unused functions to find `min` packs, such as `get_permutations`,
`pll_free`, etc.
Signed-off-by: Sun Chao
Signed-off-by: Jiang Xin
Signed-off-by: Junio C Hamano
---
builtin/pack-redundant.c | 86
1 file changed, 86 deletions(-)
From: Sun Chao
When calling `git pack-redundant --all`, if there are too many local
packs and too many redundant objects within them, the too deep iteration
of `get_permutations` will exhaust all the resources, and the process of
`git pack-redundant` will be killed.
The following script could cr
From: Jiang Xin
Add test cases for git pack-redundant to validate new algorithm for git
pack-redundant.
Signed-off-by: Jiang Xin
Reviewed-by: SZEDER Gábor
---
t/t5323-pack-redundant.sh | 157 ++
1 file changed, 157 insertions(+)
create mode 100755 t/t5323-
On Thu, Jan 10, 2019 at 11:28:34AM +0800, Jiang Xin wrote:
> SZEDER Gábor 于2019年1月9日周三 下午8:56写道：
> > > + sed -e "s#^.*/pack-\(.*\)\.\(idx\|pack\)#\1#g" | \
> >
> > This sed command doesn't seem to work on macOS (on Travis CI), and
> > causes the test to fail with:
> >
>
> It works if
--
Your long awaited part payment of $4,500,000.00 Usd is ready for
immediate release to you,
and it was electronically credited into an ATM Visa Card for easy
delivery.
Your new Payment Reference No.- 6363836,
Password No: 006786,
Pin Code No: 1787,
Your Certificate of Merit Payment No: 058
62 matches
Mail list logo
