On Wed, Jul 25, 2018 at 10:56 PM Ben Peart wrote:
> I'm still very new to this part of the code so am trying to figure out
> what you're suggesting. I've read your description a few times and what
> I'm getting out of it is that with some additional checks (ie verify
> it's a twoway_merge,
Hi,
I am unable to use Git (version 2.18 latest). Since i couldnt find any
help/support/contact email on https://git-scm.com and i couldnt find the
solution using Google as well i am directly contacting you as i need to get
git working. Hope you can help me.
please find attached an image file
On Wed, Jul 25, 2018 at 08:41:31PM +0200, SZEDER Gábor wrote:
> On Wed, Jul 25, 2018 at 4:51 PM Max Kirillov wrote:
>>> I just happened to stumble upon a failure because of 'fatal: the
>>> remote end hung up unexpectedly' in the test 'push plain'.
>>
>> Did it happen once or repeated? It is
Daniel Baumann writes:
> On 07/25/2018 12:54 PM, Ævar Arnfjörð Bjarmason wrote:
>> The code you're modifying doesn't exist in the "pu" branch since
>> 249d626f2c
>
> indeed, thanks.
>
>> From looking at it it seems we no longer have this problem,
>> but perhaps you'd like to check that out for
Junio C Hamano writes:
> Stefan Beller writes:
>
>>> * ag/rebase-i-in-c (2018-07-10) 13 commits
>> [...]
>>>
>>> Piecemeal rewrite of the remaining "rebase -i" machinery in C.
>>>
>>> A reroll (which is rumored to be quite good) exists, but hasn't
>>> been picked up yet.
>>
>> Forgot to
Junio C Hamano writes:
> Stefan Beller writes:
>
>>> * js/range-diff (2018-07-25) 21 commits
>
> The non-coloring part, like patch matching and driving diff over a
> pair of "git show" output, looked reasonably solid when I read it
> (even though I admit I did not audit for leaks).
>
> The only
Hi,
On 07/25/2018 12:54 PM, Ævar Arnfjörð Bjarmason wrote:
> The code you're modifying doesn't exist in the "pu" branch since
> 249d626f2c
indeed, thanks.
> From looking at it it seems we no longer have this problem,
> but perhaps you'd like to check that out for yourself?
Yes, it's not needed
Thanks for the review.
The hook does not receive any information or input from git. The
original requirement
comes from my colleague. He want to run unit test automatically before
submitting code
to remote repository. Or else CI server will send the blame mail to the manager.
The hook actually
Beat Bolli wrote:
> When compiling under Apple LLVM version 9.1.0 (clang-902.0.39.2) with
> "make DEVELOPER=1 DEVOPTS=pedantic", the compiler says
>
> error: redeclaration of already-defined enum 'object_type' is a GNU
> extension [-Werror,-Wgnu-redeclared-enum]
>
> According to
Stefan Beller writes:
>> * ag/rebase-i-in-c (2018-07-10) 13 commits
> [...]
>>
>> Piecemeal rewrite of the remaining "rebase -i" machinery in C.
>>
>> A reroll (which is rumored to be quite good) exists, but hasn't
>> been picked up yet.
>
> Forgot to state so on either the mailing list (or
Stefan Beller writes:
>> * jh/structured-logging (2018-07-25) 25 commits
> [...]
>> - structured-logging: design document
>> (this branch uses jh/json-writer.)
>>
>> X-Gah.
>
> I am not sure what to make of this comment?
That's just a line/editor noise.
> Does it need review or is the
Stefan Beller writes:
>> * js/range-diff (2018-07-25) 21 commits
> I think the current coloring is good enough to ship, but it still has
> errors around corners, for example introduction of new files,
> having lines in the inner diff as:
>
> diff --git a/Makefile b/Makefile
> ---
On Wed, Jul 25, 2018 at 09:45:52AM -0700, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > @@ -125,19 +122,19 @@ Detailed Design
> > ---
> > Repository format extension
> > ~~~
> > -A NewHash repository uses repository format version `1` (see
On Wed, Jul 25, 2018 at 3:13 PM 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
Alban Gruin writes:
> This patch series rewrite the interactive rebase from shell to C.
>
> It is based on master (as of 2018-07-24).
With fewer number of bytes than "as of ", you can express it in
a more useful way, even when you and others live in different
timezones and when the 'master'
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 am still holding onto them.
Many topics have moved to
When compiling under Apple LLVM version 9.1.0 (clang-902.0.39.2) with
"make DEVELOPER=1 DEVOPTS=pedantic", the compiler says
error: redeclaration of already-defined enum 'object_type' is a GNU
extension [-Werror,-Wgnu-redeclared-enum]
According to
Following up on my previous series bb/pedantic for gcc, this is a fix
for pedantic compilation under MacOS 10.13.6 (High Sierra) with the
command line tools of Xcode Version 9.4.1 (9F2000).
Changes against v1:
- [1/2]: include cache.h in packfile.h.
- [2/2]: drop it. Christian Couder is going
Jonathan Nieder writes:
> Regardless of how we spell it in prose, I think `sha256` as an
> identifier in configuration is the spelling people will expect. For
> example, gpg ("gpg --version") calls it SHA256.
OK.
> For what it's worth, I would be in favor of modifying the section
> more
Christian Couder writes:
> Hi,
>
> On Wed, Jul 25, 2018 at 12:03 AM, Beat Bolli wrote:
>>
>> On 24.07.18 23:59, Jonathan Nieder wrote:
>>>
>>> Beat Bolli wrote:
>
-inline void remote_odb_reinit(void)
+void remote_odb_reinit(void)
>>>
>>> This looks like an oversight in
>>>
Eric Sunshine writes:
> @@ -750,6 +751,20 @@ void show_log(struct rev_info *opt)
>
> memcpy(_queued_diff, , sizeof(diff_queued_diff));
> }
> +
> + if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
> + struct diff_queue_struct dq;
> +
> + memcpy(,
On 7/24/2018 11:33 AM, Duy Nguyen wrote:
On Tue, Jul 24, 2018 at 6:20 AM Jeff King wrote:
At least that's my view of it. unpack_trees() has always been a
terrifying beast that I've avoided looking too closely at.
/me nods on the terrifying part.
After a quick look at the code, the only
Eric Sunshine writes:
> When submitting a revised a patch series, the --range-diff option embeds
> a range-diff in the cover letter showing changes since the previous
> version of the patch series. The argument to --range-diff is a simple
> revision naming the tip of the previous series, which
Eric Sunshine writes:
> I did consider other approaches, such as a more generic option. For
> example, --embed=range-diff:. I also considered supporting more
> complex use-cases. For instance, git-range-diff itself accepts the two
> ranges in several formats ("a..b c..d" or "x...z" or "i j k"),
Eric Sunshine writes:
> Bikeshedding: Should this be named 'p4-pre-submit'? That way, if
> git-p4 ever grows additional hooks, they can all be grouped under the
> "p4-" prefix.
An excellent suggestion.
> Does the hook receive any arguments? Does it receive anything on its
> standard input?
On Wed, Jul 25, 2018 at 9:45 AM Chen Bin wrote:
> Hook pre-p4-submit is executed before git-p4 actually submits code.
> If the hook exits with non-zero value, submit process will abort.
Bikeshedding: Should this be named 'p4-pre-submit'? That way, if
git-p4 ever grows additional hooks, they can
Hi,
On Fri, 20 Jul 2018, brian m. carlson wrote:
> On Fri, Jul 20, 2018 at 05:51:46PM -0400, Jeffrey Walton wrote:
>
> > (If anyone is interested in first class Solaris support then I am
> > happy to help. The patch set needed for the platform has been stable
> > for the last couple of years).
On Wed, Jul 25, 2018 at 1:29 PM Junio C Hamano wrote:
> A few random thoughts.
>
> * I find it somewhat disturbing that use of dash is inconsistent
>between "--interdiff=" and "--range-diff=".
I went with the common spellings we've seen on the mailing lists.
"Interdiff", in particular,
On Tue, Jul 24, 2018 at 9:34 AM Alban Gruin wrote:
>
> This patch series rewrite the interactive rebase from shell to C.
>
> It is based on master (as of 2018-07-24).
>
> Changes since v3:
>
> - The `--verbose` option is stored directly into opts.verbose
>
> - Drop includes in
On Wed, Jul 25, 2018 at 4:51 PM Max Kirillov wrote:
>
> On Wed, Jul 25, 2018 at 02:14:35PM +0200, SZEDER Gábor wrote:
> >> +# sometimes there is fatal error buit the result is still 200
> >> +if grep 'fatal:' act.err
> >> +then
> >> +return 1
> >> +fi
> >
> > I just
On Tue, Jul 24, 2018 at 06:51:39AM -0400, Jeff King wrote:
> When we initially added the strbuf_readlink() function in
> b11b7e13f4 (Add generic 'strbuf_readlink()' helper function,
> 2008-12-17), the point was that we generally have a _guess_
> as to the correct size based on the stat
On 7/25/2018 2:08 PM, Junio C Hamano wrote:
Jonathan Tan writes:
+ } else if (!strcmp(av[1], "commit_contains")) {
+ struct ref_filter filter;
+ struct contains_cache cache;
+ init_contains_cache();
+
+ if (ac > 2 && !strcmp(av[2],
Eric Sunshine writes:
> On Mon, Jul 23, 2018 at 6:59 PM Stefan Beller wrote:
>> On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine
>> wrote:
>> > The actual diffs output by range-diff respect diff_option.file, which
>> > range-diff passes down the call-chain, thus are destination-agnostic.
>> >
Jonathan Tan writes:
>> +} else if (!strcmp(av[1], "commit_contains")) {
>> +struct ref_filter filter;
>> +struct contains_cache cache;
>> +init_contains_cache();
>> +
>> +if (ac > 2 && !strcmp(av[2], "--tag"))
>> +
On 07/25, Duy Nguyen wrote:
> On Tue, Jul 24, 2018 at 9:29 PM Brandon Williams wrote:
> >
> > On 07/17, Brandon Williams wrote:
> > > Signed-off-by: Brandon Williams
> > > ---
> > >
> > > Since introducing protocol v2 and enabling fetch I've been thinking
> > > about what its inverse 'push'
On Mon, Jul 23, 2018 at 2:49 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > On Sat, Jul 21, 2018 at 3:04 PM Johannes Schindelin via GitGitGadget
> > wrote:
> >
> >> Side note: I work on implementing range-diff not only to make life easier
> >> for reviewers who have to suffer through
On Mon, Jul 23, 2018 at 9:59 PM Eric Sunshine wrote:
>
> On Mon, Jul 23, 2018 at 12:28 PM Duy Nguyen wrote:
> > On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine
> > wrote:
> > > diff --git a/Documentation/git-format-patch.txt
> > > b/Documentation/git-format-patch.txt
> > > index
On 25.07.18 18:57, Junio C Hamano wrote:
> Beat Bolli writes:
>
>> In the interest of code hygiene, make it easier to compile Git with the
>> flag -pedantic.
>>
>> Pure pedantic compilation with GCC 7.3 results in one warning per use of
>> the translation macro `N_`:
>>
>> warning: array
Eric Sunshine writes:
> On Mon, Jul 23, 2018 at 12:28 PM Duy Nguyen wrote:
>> On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine
>> wrote:
>> > diff --git a/Documentation/git-format-patch.txt
>> > b/Documentation/git-format-patch.txt
>> > index f8a061794d..e7f404be3d 100644
>> > ---
Hi,
Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>> The consensus on the mailing list seems to be that SHA-256 should be
>> picked as our NewHash, see the "Hash algorithm analysis" thread as of
>> [1]. Linus has come around to this choice and suggested Junio make the
>> final pick,
Beat Bolli writes:
> In the interest of code hygiene, make it easier to compile Git with the
> flag -pedantic.
>
> Pure pedantic compilation with GCC 7.3 results in one warning per use of
> the translation macro `N_`:
>
> warning: array initialized from parenthesized string constant
Ævar Arnfjörð Bjarmason writes:
> @@ -125,19 +122,19 @@ Detailed Design
> ---
> Repository format extension
> ~~~
> -A NewHash repository uses repository format version `1` (see
> +A SHA-256 repository uses repository format version `1` (see
>
On 7/24/2018 11:13 AM, Duy Nguyen wrote:
On Mon, Jul 23, 2018 at 04:51:38PM -0400, Ben Peart wrote:
What's the current state of the index before this checkout?
This was after running "git checkout" multiple times so there was really
nothing for git to do.
Hmm.. this means cache-tree is
On Tue, Jul 24, 2018 at 9:29 PM Brandon Williams wrote:
>
> On 07/17, Brandon Williams wrote:
> > Signed-off-by: Brandon Williams
> > ---
> >
> > Since introducing protocol v2 and enabling fetch I've been thinking
> > about what its inverse 'push' would look like. After talking with a
> >
On Wed, Jul 25, 2018 at 02:14:35PM +0200, SZEDER Gábor wrote:
>> +# sometimes there is fatal error buit the result is still 200
>
> s/buit/but/
Thanks, will fix
>> +if grep 'fatal:' act.err
>> +then
>> +return 1
>> +fi
>
> I just happened to stumble upon a failure
On Wed, Jul 25, 2018 at 01:02:16PM +, David Hind wrote:
> I work for a company that is looking to adopt VCS and I like sound of
> Git (although I have no experience of using VCS). My question is,
> everything seems to be directed towards code developers. Can I use Git
> to do revision control
Hook pre-p4-submit is executed before git-p4 actually submits code.
If the hook exits with non-zero value, submit process will abort.
Signed-off-by: Chen Bin
---
Documentation/git-p4.txt | 7 +++
Documentation/githooks.txt | 7 +++
git-p4.py | 18 +-
Hi David,
I have used git over the past 3 years in a manufacturing environment to
manage component designs in a CAD/factory automation setting. There are a
few main factors that you need to consider:
1. You will need an external tool like Git for Windows, GitHub Client or
SourceTree for
Hi,
I work for a company that is looking to adopt VCS and I like sound of Git
(although I have no experience of using VCS). My question is, everything seems
to be directed towards code developers. Can I use Git to do revision control
for other types of design document? For example electrical
On 7/24/2018 3:56 PM, Taylor Blau wrote:
On Tue, Jul 24, 2018 at 03:30:10PM +, g...@jeffhostetler.com wrote:
From: Jeff Hostetler
In commit fb0dc3bac135e9f6243bd6d293e8c9293c73b9cd code was added
to builtin/config.c to define a new function and a forward declaration
for an array of
On 7/24/2018 2:13 PM, Beat Bolli wrote:
Hi Jeff
On 24.07.18 16:42, g...@jeffhostetler.com wrote:
From: Jeff Hostetler
Replace non-standard "\e" escape sequence with "\x1B".
This was already fixed in <20180708144342.11922-4-dev+...@drbeat.li>.
Cheers,
Beat
Thanks for the pointer. I
[Hrm, this time with hopefully proper In-Reply-To: header.
Sorry for the double post.]
> Push passes to another commands, as described in
> https://public-inbox.org/git/20171129032214.gb32...@sigill.intra.peff.net/
>
> As it gets complicated to correctly track the data length, instead
> Push passes to another commands, as described in
> https://public-inbox.org/git/20171129032214.gb32...@sigill.intra.peff.net/
>
> As it gets complicated to correctly track the data length, instead transfer
> the data through parent process and cut the pipe as the specified length is
> reached.
Thanks for you review. I will update documentation asap.
On Wed, Jul 25, 2018 at 7:14 PM, Ævar Arnfjörð Bjarmason
wrote:
>
> On Wed, Jul 25 2018, Luke Diamand wrote:
>
>> On 23 July 2018 at 12:27, Chen Bin wrote:
>>> Hook pre-p4-submit is executed before git-p4 actually submits code.
>>> If the
On Wed, Jul 25 2018, Daniel Baumann wrote:
> the attached patch removes a superfluous tab indentation in the
> interactive git-rebase messages.
>
> It would be nice to get rid of this to avoid visual disturbance with
> whitespace highlighting editors.
The code you're modifying doesn't exist in
Hi,
the attached patch removes a superfluous tab indentation in the
interactive git-rebase messages.
It would be nice to get rid of this to avoid visual disturbance with
whitespace highlighting editors.
Regards,
Daniel
>From 353eb1c2c44d5117a3fad1323ca6852b13e4c86a Mon Sep 17 00:00:00 2001
Hi all,
The project I work on currently heavily uses git. We would like to add some
tools based around detecting how branches change over time for code review,
so
that users can compare commits as they change. We'd like to do this via
adding
metadata in git notes, so that we can detect when
On Wed, Jul 25 2018, Luke Diamand wrote:
> On 23 July 2018 at 12:27, Chen Bin wrote:
>> Hook pre-p4-submit is executed before git-p4 actually submits code.
>> If the hook exits with non-zero value, submit process will abort.
>
>
> Looks good to me - could you add some documentation please
>
On 23 July 2018 at 12:27, Chen Bin wrote:
> Hook pre-p4-submit is executed before git-p4 actually submits code.
> If the hook exits with non-zero value, submit process will abort.
Looks good to me - could you add some documentation please
(Documentation/git-p4.txt).
Thanks!
Luke
>
>
On Tue, Jul 24, 2018 at 6:17 PM brian m. carlson
wrote:
> On Mon, Jun 11, 2018 at 03:47:43AM -0400, Eric Sunshine wrote:
> > Here's what I had envisioned when reading your emails about OID lookup
> > table functionality:
> >
> > --- >8 ---
> > test_oid_cache () {
> > while read tag rest
> >
The changelog embedded in the document pre-dates the addition of the
document to git.git (it used to be a Google Doc), so it only goes up
to 752414ae43 ("technical doc: add a design doc for hash function
transition", 2017-09-27).
Since then I made some small edits to it, which would have been
The consensus on the mailing list seems to be that SHA-256 should be
picked as our NewHash, see the "Hash algorithm analysis" thread as of
[1]. Linus has come around to this choice and suggested Junio make the
final pick, and he's endorsed SHA-256 [3].
This follow-up change changes occurrences of
On Tue, Jul 24 2018, Junio C Hamano wrote:
> Linus Torvalds writes:
>
>> On Tue, Jul 24, 2018 at 12:01 PM Edward Thomson
>> wrote:
>>>
>>> Switching gears, if I look at this from the perspective of the libgit2
>>> project, I would also prefer SHA-256 or SHA3 over blake2b. To support
>>>
On Tue, Jul 24, 2018 at 6:09 PM Jonathan Nieder wrote:
> Eric Sunshine wrote:
> > Subject: diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
>
> It would be clearer to say something like
>
> diff --color-moved: add "dimmed-zebra" synonym for "dimmed_zebra"
That could work,
Am 23.07.2018 um 15:52 schrieb Johannes Schindelin via GitGitGadget:
From: Johannes Schindelin
This adds a couple settings for the .c/.h files so that it is easier to
conform to Git's conventions while editing the source code.
Signed-off-by: Johannes Schindelin
---
contrib/vscode/init.sh |
Hi,
On Wed, Jul 25, 2018 at 12:03 AM, Beat Bolli wrote:
>
> On 24.07.18 23:59, Jonathan Nieder wrote:
>>
>> Beat Bolli wrote:
>>> -inline void remote_odb_reinit(void)
>>> +void remote_odb_reinit(void)
>>
>> This looks like an oversight in
>>
68 matches
Mail list logo
