> On Tue, Sep 24, 2019 at 12:22:27PM +0200, Uwe Brauer wrote:
> I hear you: I had a brief encounter with Mercurial not that long ago,
> and there were several things that didn't work the way I expected (or
> rather: the way I got used to with Git). The subtle and sometimes
> not
Am 09.10.19 um 03:19 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> We do not want to have it for *all* cases, where we return -1 - pos, but
>> only for those cases, where the result was actually encoded by
>> index_pos_to_insert_pos().
>
> Yup, I agree with you that decoder should be fed
> -Original Messages-
> From: "Junio C Hamano"
> Sent Time: 2019-10-09 11:02:44 (Wednesday)
> To: wuzhouhui
> Cc: git@vger.kernel.org, cuif...@sugon.com
> Subject: Re: How to find the commit that erase a change
>
> wuzhouhui writes:
>
> > I have a file which contains complicated change
wuzhouhui writes:
> I have a file which contains complicated change history. When I use
> git log -p file
> to see all changes made in this file, I found that a change disappeared
> for no reason.
"git log [-p] " is not about seeing *all* changes made to
the path(s) that match the pathspec.
On Tue, Oct 8, 2019 at 3:47 PM Lucas Oshiro wrote:
>
> Improve code readability by moving tag body reading to a new function called
> get_tag_body. This function will be used in the following patches to fix the
> --no-edit flag.
This seems to be accidentally duplicated from patch 1/3.
> Enhance
Hi,
I have a file which contains complicated change history. When I use
git log -p file
to see all changes made in this file, I found that a change disappeared
for no reason.
For example, I made following change in a commit:
@@ -2,3 +2,8 @@ int main(void)
{
printf("hello world");
}
Hi!
Dominik Salvet wrote:
> 1) `git fetch origin && git remote set-head origin -a`
> 2) `git fetch origin +refs/heads/*:refs/remotes/origin/*
> HEAD:refs/remotes/origin/HEAD`
> 3) instead of git init and remote, use directly `git clone --no-checkout`
>
> The first solution is not suitable due its
SZEDER Gábor writes:
> On Tue, Oct 08, 2019 at 09:49:35AM +0200, Toon Claes wrote:
>> Add support to provide the Co-author when committing. For each
>> co-author provided with --coauthor=, a line is added at the
>> bottom of the commit message, like this:
>>
>> Co-authored-by:
>>
>> It's a
Junio C Hamano wrote:
> For reference, here is the CoC the patch wants to add (there is no
> such topic yet locally, nor a single patch that can be made into
> such a topic, so there isn't exactly something people can Ack on
> yet. So here is a "preview" of what we would see once such a series
> l
On Tue, Oct 8, 2019 at 3:47 PM Lucas Oshiro wrote:
>
> Improve code readability by moving tag reading to a new function called
> get_tag_body, which will be used in the implementation of the git tag
> --amend functionality.
This function is also used in your third patch, to fix git-tag's
--no-edi
On Wed, Oct 09, 2019 at 09:14:59AM +0900, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > In other words, the commit message can be augmented by this:
> >
> > Acked-by: Johannes Schindelin
> > Acked-by: Derrick Stolee
> > Acked-by: Garima Singh
> > Acked-by: Jonathan Tan
> > Acked-b
On Tue, Oct 08, 2019 at 09:49:35AM +0200, Toon Claes wrote:
> Add support to provide the Co-author when committing. For each
> co-author provided with --coauthor=, a line is added at the
> bottom of the commit message, like this:
>
> Co-authored-by:
>
> It's a common practice use when pairin
On Tue, Oct 08, 2019 at 09:36:26PM +0200, Johannes Schindelin wrote:
> I missed a well-ACKed contribution in here: the code of conduct Peff
> kindly submitted, with the add-on that clarifies who is in that group of
> potential mediators. See
>
> https://public-inbox.org/git/20190924064454.ga30...@
Hello Git community!
Imagine a repository initialised using git init. Then, a remote (e.g.,
origin) is added. Now, I want to fetch all branches, tags and commits
from the prepared remote to fill the local repository up for the first
time and do it as quick as possible. I want the origin/HEAD refere
On Tue, Oct 08, 2019 at 01:30:34PM +0900, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >>func(PROGRESS | REGRESS);
> >>func(PROGRESS + REGRESS);
> >>func(PROGRESS * 3);
> >>}
> >>
> >> how caller came about to give 3?
> >
> > No, they tend to show (PRO
Derrick Stolee writes:
> On 10/6/2019 7:30 PM, Eric Wong wrote:
>> v3 changes:
>> - use __typeof__ to avoid invalid clang warning on uninitialized var
>> - formatting fixes recommended by Stolee
>> - add Reviewed-by for Stolee
>> - add patch 20 to update docs to drop first member requirement
>>
Johannes Sixt writes:
> We do not want to have it for *all* cases, where we return -1 - pos, but
> only for those cases, where the result was actually encoded by
> index_pos_to_insert_pos().
Yup, I agree with you that decoder should be fed only the data
emitted by the encoder.
But shouldn't the
On Wed, Oct 09, 2019 at 09:14:59AM +0900, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > In other words, the commit message can be augmented by this:
> >
> > Acked-by: Johannes Schindelin
> > Acked-by: Derrick Stolee
> > Acked-by: Garima Singh
> > Acked-by: Jonathan Tan
> > Acked-by
On Tue, Oct 08, 2019 at 09:24:56AM -0700, William Baker wrote:
> On 10/7/19 9:30 PM, Junio C Hamano wrote:
> > SZEDER Gábor writes:
> >
> >>> func(PROGRESS | REGRESS);
> >>> func(PROGRESS + REGRESS);
> >>> func(PROGRESS * 3);
> >>> }
> >>>
> >>> how caller came abo
Johannes Schindelin writes:
> In other words, the commit message can be augmented by this:
>
> Acked-by: Johannes Schindelin
> Acked-by: Derrick Stolee
> Acked-by: Garima Singh
> Acked-by: Jonathan Tan
> Acked-by: Thomas Gummerer
> Acked-by: brian m. carlson
> Acked-by: Elijah Newren
>
> J
On Tue, Sep 24, 2019 at 12:22:27PM +0200, Uwe Brauer wrote:
> I am confused, I just pulled
> but git log --graph --decorate
> did not show all commits,
>
> Only
>
> git log --graph --decorate --all
>
> and from the emails I received the commits shown by --all
>
> Should be on a new branch.
Hello,
Quick question, hopefully. Have tried searching through my local archive
of the list but didn't find an answer, so fingers crossed this hasn't come
up come up frequently in the past...
So, a fresh shallow clone[1] of Linus' mainline repo followed by
"git fetch --unshallow" results in:
f
Am 08.10.19 um 14:04 schrieb Johannes Schindelin:
> So you got what you wished for:
> https://public-inbox.org/git/pull.378.git.gitgitgad...@gmail.com
After having seen the result I do not wish for it anymore. (Not that I
had "wished" for it in the first place...) It does not make the result
any m
Am 08.10.19 um 08:48 schrieb Johannes Schindelin via GitGitGadget:
> We have just introduced the helper `index_pos_to_insert_pos()` to help
> avoiding underflows when returning `-1 - pos` for cases where we want to
> return an insert position, using the ones' complement (as `int`).
We do not want
On Tue, Oct 08, 2019 at 03:22:57PM -0400, Joey Hess wrote:
> I'm surprised to find that git cat-file --batch, on a Linux system,
> strips the \r from an input like "HEAD:foo\r\n"
>
> It's obvious, of course, that it will remove the newline, and so this
> interface cannot be used to query about a
Hi Pratyush,
On Tue, Oct 8, 2019 at 7:59 PM Pratyush Yadav wrote:
> On 07/10/19 06:52PM, Birger Skogeng Pedersen wrote:
> > So I kinda got this working, but only when focusing the commit message
> > widget.
>
> Isn't this the point of your feature? You change the view when focusing
> the commit
Hi Thomas,
On Tue, 8 Oct 2019, Thomas Gummerer wrote:
> In ef283b3699 ("apply: make parse_git_diff_header public", 2019-07-11)
> the 'parse_git_diff_header' function was made public and useable by
> callers outside of apply.c.
>
> However it was missed that its (then) only caller, 'find_header' d
On 2019-10-08 at 12:33:43, Bert Wesarg wrote:
> On Tue, Oct 8, 2019 at 2:21 PM Derrick Stolee wrote:
> >
> > On 10/5/2019 5:12 PM, brian m. carlson wrote:
> > > Adjust the test so that it computes variables for object IDs instead of
> > > using hard-coded hashes.
> >
> > [snip]
> >
> > > @@ -137,1
Hi Junio,
On Mon, 7 Oct 2019, 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 appear in any of
> the integration branches, but I a
Hi all, there is an update:
I added necessary error catching code so that, script will not crash if the
keybinding code is worng. Instead of crashing it will print error message.
The final patch will look something like this.
---
lib/tools.tcl | 24
1 file changed, 20 in
On 2019-10-08 at 11:51:45, Derrick Stolee wrote:
> On 10/5/2019 5:11 PM, brian m. carlson wrote:
> > Add an option to print the object format used for input, output, or
> > storage. This allows shell scripts to discover the hash algorithm in
> > use.
>
> Why put this in 'rev-parse'? Is a test help
I'm surprised to find that git cat-file --batch, on a Linux system,
strips the \r from an input like "HEAD:foo\r\n"
It's obvious, of course, that it will remove the newline, and so this
interface cannot be used to query about a filename that, for some
horrible reason[1], contains a newline. But ve
git tag --edit and --no-edit flags are not currently fully supported.
This patch fixes the functionality that allows the editor to be opened
on demand.
Co-authored-by: Bárbara Fernandes
Signed-off-by: Lucas Oshiro
Signed-off-by: Bárbara Fernandes
---
builtin/tag.c | 16 +---
t/t70
Improve code readability by moving tag body reading to a new function called
get_tag_body. This function will be used in the following patches to fix the
--no-edit flag.
Enhance legibility by encapsulating code that loads previous tag message
(if any) in new function prepare_tag_template. This cod
This series of patches fixes the flags --edit and --no-edit. Currently,
--no-edit has no effect.
These patches implement the following behaviour:
- when --edit is provided, the editor will always be opened;
- when --no-edit is provided, the editor will not be opened (if possible),
otherwise an
Improve code readability by moving tag reading to a new function called
get_tag_body, which will be used in the implementation of the git tag
--amend functionality.
Add warning in write_tag_body() in case the tag body is not successfully
recovered.
Co-authored-by: Bárbara Fernandes
Signed-off-by
When building the packfile to be sent, send_pack() is given a list of
remote refs to be used as exclusions. For each ref, it first checks if
the ref exists locally, and if it does, passes it with a "^" prefix to
pack-objects. However, in a partial clone, the check may trigger a lazy
fetch.
The add
From: Johannes Schindelin
Inspired by the thoroughly stale https://github.com/git/git/pull/159,
this patch fixes a couple of typos, rewraps and clarifies some comments.
Signed-off-by: Johannes Schindelin
---
xdiff/xdiffi.c | 99 --
1 file changed
Some of these changes are best viewed with --color-words.
Johannes Schindelin (1):
xdiffi: fix typos and touch up comments
xdiff/xdiffi.c | 99 --
1 file changed, 55 insertions(+), 44 deletions(-)
base-commit: b744c3af07a15aaeb1b82fab689995fd55
On 07/10/19 06:52PM, Birger Skogeng Pedersen wrote:
> So I kinda got this working, but only when focusing the commit message widget.
Isn't this the point of your feature? You change the view when focusing
the commit message widget. I remember you were explicitly against doing
it as soon as all u
In ef283b3699 ("apply: make parse_git_diff_header public", 2019-07-11)
the 'parse_git_diff_header' function was made public and useable by
callers outside of apply.c.
However it was missed that its (then) only caller, 'find_header' did
some error handling, and completing 'struct patch' appropriate
From: Garima Singh
Empty arguments passed on the command line can be a represented by
a '', however sq_quote_buf_pretty was incorrectly dropping these
arguments altogether. Fix this problem by ensuring that such
arguments are emitted as '' instead.
Reported by: Junio Hamano
Signed-off-by: Garim
Hey,
Empty arguments passed on the command line can be a represented by a '',
however sq_quote_buf_pretty was incorrectly dropping these arguments
altogether. Fix this problem by ensuring that such arguments are emitted as
'' instead.
Looking forward to your review. Cheers! Garima Singh
Reported
Good Day,
I sent you an e-mail previously about our proposal on Investment in
your country, but I did not receive any feedback from you.
Kindly confirm that you got my message as I await for your response.
Sincere regards,
Zino
On 10/7/19 9:30 PM, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
>>> func(PROGRESS | REGRESS);
>>> func(PROGRESS + REGRESS);
>>> func(PROGRESS * 3);
>>> }
>>>
>>> how caller came about to give 3?
>>
>> No, they tend to show (PROGRESS | REGRESS), at least
Hi Junio,
Le 08/10/2019 à 04:45, Junio C Hamano a écrit :
> Alban Gruin writes:
>
>> This can be seen as a continuation of ag/reduce-rewriting-todo.
>>
>> Currently, complete_action() releases its todo list before calling
>> sequencer_continue(), which reloads the todo list from the disk. This
On Mon, Oct 7, 2019 at 7:36 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor
>
> I think the above was an earlier incarntion of what is now known as
> 8e4ec337 ("merge-recursive: fix the diff3 common ancestor label fo
On Mon, Oct 7, 2019 at 11:52 PM Josef Wolf wrote:
>
> Hello,
>
> This is a repost, since the original message seems to have been lost somehow.
>
>
> I am trying to add a file to an arbitrary branch without touching the current
> worktree with as little overhead as possible. This should work no mat
Quoting Johannes Sixt (2019-10-05 07:09:11)
> Am 04.10.19 um 23:30 schrieb Stephen Boyd:
> > While reviewing some dts diffs recently I noticed that the hunk header
> > logic was failing to find the containing node. This is because the regex
> > doesn't consider properties that may span multiple lin
On 10/6/2019 7:30 PM, Eric Wong wrote:
> v3 changes:
> - use __typeof__ to avoid invalid clang warning on uninitialized var
> - formatting fixes recommended by Stolee
> - add Reviewed-by for Stolee
> - add patch 20 to update docs to drop first member requirement
>
> Range-diff against v2:
I scann
On 10/8/2019 4:58 AM, Johannes Schindelin wrote:
> Hi Eric & Junio,
>
> On Sun, 6 Oct 2019, Eric Wong wrote:
>
>> v3 changes:
>> - use __typeof__ to avoid invalid clang warning on uninitialized var
>> - formatting fixes recommended by Stolee
>> - add Reviewed-by for Stolee
>> - add patch 20 to up
Hi Junio,
On Tue, 8 Oct 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I didn't quite understand this part, though.
> >>
> >> The default creation factor is 60 (roughly speaking, it wants 60% of
> >> the lines to match between two patches, otherwise it considers the
> >
On 10/5/2019 5:11 PM, brian m. carlson wrote:
> This series consists mostly of additional test fixes for SHA-256, plus
> some test framework improvements and a new option to rev-parse.
>
> Up until now, most of the test changes have been directly related to
> fixing hash values or sizes in some wa
On 10/8/2019 8:33 AM, Bert Wesarg wrote:
> On Tue, Oct 8, 2019 at 2:21 PM Derrick Stolee wrote:
>>
>> On 10/5/2019 5:12 PM, brian m. carlson wrote:
>>> Adjust the test so that it computes variables for object IDs instead of
>>> using hard-coded hashes.
>>
>> [snip]
>>
>>> @@ -137,14 +141,17 @@ tes
On Tue, Oct 8, 2019 at 2:21 PM Derrick Stolee wrote:
>
> On 10/5/2019 5:12 PM, brian m. carlson wrote:
> > Adjust the test so that it computes variables for object IDs instead of
> > using hard-coded hashes.
>
> [snip]
>
> > @@ -137,14 +141,17 @@ test_expect_success SYMLINKS 'setup symlinks with
On Fri, Sep 27, 2019 at 02:02:01PM +0200, SZEDER Gábor wrote:
> On Fri, Sep 27, 2019 at 11:51:07AM +0200, Anders Janmyr wrote:
> > I'm not sure if this is a bug or not but `git describe` gives
> > different results when the repo has been cloned with `--depth` or not.
> >
> > In the example below f
On 10/5/2019 5:12 PM, brian m. carlson wrote:
> Adjust the test so that it computes variables for object IDs instead of
> using hard-coded hashes.
>
> Signed-off-by: brian m. carlson
> ---
> t/t4015-diff-whitespace.sh | 89 +++---
> 1 file changed, 53 insertions(+
On 10/5/2019 5:12 PM, brian m. carlson wrote:
> Adjust the test so that it computes variables for object IDs instead of
> using hard-coded hashes.
[snip]
> @@ -137,14 +141,17 @@ test_expect_success SYMLINKS 'setup symlinks with
> attributes' '
> '
>
> test_expect_success SYMLINKS 'symlinks d
It is a good idea to have a readme so people finding the project can
know more about it, and know how they can get involved.
Signed-off-by: Pratyush Yadav
---
Changes in v3:
- Reword the first paragraph to avoid some repetition. Suggested by
Junio.
- Do not mention "written in Tcl" in the intro
Hi Hannes,
On Sun, 6 Oct 2019, Johannes Sixt wrote:
> Am 06.10.19 um 02:02 schrieb Junio C Hamano:
> > Johannes Schindelin writes:
> >
> >>> IMHO, if you don't accompany insert_pos_as_negative_offset() with a
> >>> corresponding extract_pos_and_found_condition() and use it everywhere,
> >>> it i
On 08/10/2019 11:11, Phillip Wood wrote:
> Hi Toon & Zeger-Jan
>
> On 08/10/2019 08:49, Toon Claes wrote:
>> Add support to provide the Co-author when committing. For each
>> co-author provided with --coauthor=, a line is added at the
>> bottom of the commit message, like this:
>>
>> Co-autho
On 10/5/2019 5:11 PM, brian m. carlson wrote:
> Add an option to print the object format used for input, output, or
> storage. This allows shell scripts to discover the hash algorithm in
> use.
Why put this in 'rev-parse'? Is a test helper not an option for this?
-Stolee
From: Johannes Schindelin
Since v2.9.0, Git knows about the config variable core.hookspath that
allows overriding the path to the directory containing the Git hooks.
Since v2.10.0, the `--git-path` option respects that config variable,
too, so we may just as well use that command.
Other paths i
This is yet another patch from Git for Windows.
Changes since v3:
* Adjusted the commit message to reflect that this is no longer only about
the hooks directory.
* Added a code comment to indicate how the list of keys was determined that
are used for the gitdir priming.
* The gitdir cach
Hi Pratyush,
On Tue, 8 Oct 2019, Pratyush Yadav wrote:
> Could you please change the commit subject to more clearly state that we
> are caching all paths. This is not something just related to hooks any
> more.
It is related, but not exclusively so. Changed accordingly.
> On 04/10/19 02:41PM, J
Hi Toon & Zeger-Jan
On 08/10/2019 08:49, Toon Claes wrote:
Add support to provide the Co-author when committing. For each
co-author provided with --coauthor=, a line is added at the
bottom of the commit message, like this:
Co-authored-by:
It's a common practice use when pairing up with o
Currently, the tests for GIT_SKIP_TESTS do not cover the situation where
we skip an entire test suite. The tests also do not cover the situation
where we have GIT_SKIP_TESTS defined but the test suite does not match.
Add two test cases so we cover this blindspot.
Signed-off-by: Denton Liu
---
Ch
In 6bd26f58ea (t4014: use test_line_count() where possible, 2019-08-27),
we converted many test cases to take advantage of the test_line_count()
function. In one conversion, we inverted the expected and actual value
as tested by test_line_count(). Although functionally correct, if
format-patch ever
On Mon, Oct 7, 2019 at 11:03 PM SZEDER Gábor wrote:
>
> On Sat, Oct 05, 2019 at 10:43:51AM +0200, Bert Wesarg wrote:
> > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> > index 83f52614d3..2f2cd6fea6 100755
> > --- a/t/t4014-format-patch.sh
> > +++ b/t/t4014-format-patch.sh
> > @@
Hi Eric & Junio,
On Sun, 6 Oct 2019, Eric Wong wrote:
> v3 changes:
> - use __typeof__ to avoid invalid clang warning on uninitialized var
> - formatting fixes recommended by Stolee
> - add Reviewed-by for Stolee
> - add patch 20 to update docs to drop first member requirement
This has quite a b
Welcome to the Git community, Toon!
Wow, I never realised that people actually read my braindump of issues
on GGG. Thanks for taking this on.
First some housekeeping, when formatting your patches, it's a good idea
to use `git format-patch --thread` so that your patches are grouped
together by thr
Hi Emily,
On Mon, 7 Oct 2019, Emily Shaffer wrote:
> The community discussed the list of microprojects for applicants to
> try in this mailing list thread:
> https://public-inbox.org/git/20190916184208.gb17...@google.com/
An email thread is immutable, so maybe you want to transfer at least
some
With this patch it is possible to specify a co-author when
committing. You'd just need to provide the --coauthor argument with a
co-author in the format "Co Artur ". You can
specify multiple co-authors by using the --coauthor argument multiple
times.
The Co-authored-by trailer is something that is
Add support to provide the Co-author when committing. For each
co-author provided with --coauthor=, a line is added at the
bottom of the commit message, like this:
Co-authored-by:
It's a common practice use when pairing up with other people and both
authors want to in the commit message.
Co
Hi Thomas,
On Tue, 8 Oct 2019, Johannes Schindelin wrote:
> On Mon, 7 Oct 2019, Thomas Gummerer wrote:
>
> > Subject: [PATCH] range-diff: don't segfault with mode-only changes
> >
> > If we don't have a new file, deleted file or renamed file in a diff,
> > we currently add 'patch.new_name' to the
Hi Thomas,
On Mon, 7 Oct 2019, Thomas Gummerer wrote:
> Subject: [PATCH] range-diff: don't segfault with mode-only changes
>
> If we don't have a new file, deleted file or renamed file in a diff,
> we currently add 'patch.new_name' to the range-diff header. This
> works well for files that are c
Hi Junio,
On Tue, 8 Oct 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > We can however rely on 'patch.def_name' in that case, which is
> > extracted from the 'diff --git' line and should be equal to
> > 'patch.new_name'. Use that instead to avoid the segfault.
>
> This patch makes t
77 matches
Mail list logo
