Create header for pretty.c to make formatting interface more structured.
This is a middle point, this file would be merged further with other
files which contain formatting stuff.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/notes.c | 2
Write some docs for functions in pretty.h.
Take it as a first draft, they would be changed later.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
pretty.h | 44
1 file changed, 44 insertions(+)
diff --git a/p
On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote:
>
> * jh/object-filtering (2017-12-05) 9 commits
> (merged to 'next' on 2017-12-05 at 3a56b51085)
> + rev-list: support --no-filter argument
> + list-objects-filter-options: support --no-filter
> + list-objects-filter-options: fix 'keword'
On Mon, Dec 11, 2017 at 5:05 PM, Junio C Hamano wrote:
> Jonathan Nieder writes:
>
>> I think the documentation
>>
>> ~/.gitconfig
>> User-specific configuration file. Also called "global"
>> configuration file.
>>
>> should be clarified --- e.g. it could say
>>
Hi,
On Mon, Dec 11, 2017 at 08:46:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
> I.e. we'd just ship a copy of Email::Valid and Mail::Address in
> perl/Git/FromCPAN/, use a wrapper to load them, and then we wouldn't
> need to if/else this at the code level, just always use the module,
> and it would
On 11/12/17 23:44, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> I've reworked the config handling since v4. It now stores the default
>> values in struct replay_opt rather than using global variables and
>> calls git_diff_basic_config(). Unfortunately I've not had t
On Mon, Dec 11, 2017 at 4:26 PM, Randall S. Becker
wrote:
> Sorry about the response positioning...
>
> I can send you a pull request on github, if you want 😉
>
You can use https://submitgit.herokuapp.com/ to submit to the mailing
list from a pull request.
Thanks,
Jake
please develop a new feature, git "cp" like there is git mv tomovefile1 tofile2
(to save space).
there is a solution in https://stackoverflow.com/a/44036771/466363
however, it is not single easy command.
> On 12 Dec 2017, at 08:15, Johannes Sixt wrote:
>
> Am 12.12.2017 um 01:59 schrieb Junio C Hamano:
>> Stepping back a bit, what does this thing do you are introducing?
>> And what does the other thing do that J6t is using, that would get
>> confused with this new one?
>> What does the other one
> On 12 Dec 2017, at 00:58, Eric Sunshine wrote:
>
> On Mon, Dec 11, 2017 at 6:47 PM, Lars Schneider
> wrote:
>> On 11 Dec 2017, at 19:39, Eric Sunshine wrote:
>>> On Mon, Dec 11, 2017 at 10:50 AM, wrote:
From: Lars Schneider
Git and its tools (e.g. git diff) expect all text
The documentation for git config and how it reads the user specific
configuration file is misleading. In some places it implies that
$XDG_CONFIG_HOME/git/config will always be read. In others, it implies
that only one of ~/.gitconfig and $XDG_CONFIG_HOME/git/config will be
read.
Improve the docume
On Tue, Dec 12 2017, Thomas Adam jotted:
> Hi,
>
> On Mon, Dec 11, 2017 at 08:46:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> I.e. we'd just ship a copy of Email::Valid and Mail::Address in
>> perl/Git/FromCPAN/, use a wrapper to load them, and then we wouldn't
>> need to if/else this at the cod
Signed-off-by: Ramsay Jones
---
Hi Junio,
Could you please add (or squash) this on top of the 'ab/sha1dc-build'
branch, so that I can build with NO_DC_SHA1_SUBMODULE=NoThanks in my
config.mak.
[If I were to get a vote, I would vote no to the submodule. ;-) ]
Thanks!
ATB,
Ramsay Jones
Makef
Gargi,
If you have some difficulties - please feel free to ask questions
(here or you can write me directly). I will be happy to help you.
As I understand, you are super close to finish your first patch.
Olga
Environment:
Desktop: Windows 7 Enterprise 64-bit
svn client (if applicable): 1.8.8 from Apache
git (https://git-for-windows.github.io/): git version 2.10.1.windows.1
GitTfs (https://github.com/git-tfs/git-tfs): git-tfs version 0.27.0.0 (TFS
client library 14.0.0.0 (MS)) (32-bit)
Team Foundation
On Mon, 11 Dec 2017, Junio C Hamano wrote:
> Jonathan Nieder writes:
> > I think the documentation
> > ~/.gitconfig
> > User-specific configuration file. Also called "global"
> > configuration file.
> > should be clarified --- e.g. it could say
> > $XDG_CONFIG
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development proper
Hi Jacob,
Jacob Keller wrote:
> The documentation for git config and how it reads the user specific
> configuration file is misleading. In some places it implies that
> $XDG_CONFIG_HOME/git/config will always be read. In others, it implies
> that only one of ~/.gitconfig and $XDG_CONFIG_HOME/git/c
> On 11 Dec 2017, at 22:42, Thomas Gummerer wrote:
>
> On 12/11, SZEDER Gábor wrote:
>>> Make sure that split index doesn't get broken, by running it on travis
>>> CI.
>>>
>>> Run the test suite with split index enabled in linux 64 bit mode, and
>>> leave split index turned off in 32-bit mode.
I am Ms.Ella Golan, I am the Executive Vice President Banking Division with
FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI). I am getting in touch with you
regarding an extremely important and urgent matter. If you would oblige me the
opportunity, I shall provide you with details upon your respons
FYI, I've noticed when building from "pu" that neither the
"t/helper/test-print-values" or "t/helper/test-print-larger-than-ssize"
testing artifacts added to Makefile in this patch series are not added to
"t/helper/.gitignore" like other helpers, resulting in the testing artifact
being recognized a
Thomas Adam writes:
> Hi,
>
> On Mon, Dec 11, 2017 at 08:46:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> I.e. we'd just ship a copy of Email::Valid and Mail::Address in
>> perl/Git/FromCPAN/, use a wrapper to load them, and then we wouldn't
>> need to if/else this at the code level, just always
From: "Christian Couder"
On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote:
* jh/object-filtering (2017-12-05) 9 commits
(merged to 'next' on 2017-12-05 at 3a56b51085)
+ rev-list: support --no-filter argument
+ list-objects-filter-options: support --no-filter
+ list-objects-filter-opt
From: "Ulrich Windl"
Hi!
Sorry for the late response:
On a somewhat not-up-to date manual:
-d, --delete
Delete a branch. The branch must be fully merged in its upstream
branch, or in HEAD if no upstream was set with --track or
--set-upstream.
Maybe the top
> On 12 Dec 2017, at 00:34, SZEDER Gábor wrote:
>
> While the build logic was embedded in our '.travis.yml', Travis CI
> used to produce a nice trace log including all commands executed in
> those embedded scriptlets. Since 657343a60 (travis-ci: move Travis CI
> code into dedicated scripts, 201
On Tue, Dec 12 2017, Alex Bennée jotted:
> Thomas Adam writes:
>
>> Hi,
>>
>> On Mon, Dec 11, 2017 at 08:46:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>> I.e. we'd just ship a copy of Email::Valid and Mail::Address in
>>> perl/Git/FromCPAN/, use a wrapper to load them, and then we wouldn't
>>>
Stefan Beller writes:
> Sometimes users are given a hash of an object and they want to
> identify it further (ex.: Use verify-pack to find the largest blobs,
> but what are these? or [1])
> ...
> Documentation/diff-options.txt | 6
> Makefile | 1 +
> builtin/log.c
On Tue, Dec 12, 2017 at 7:00 PM, Lars Schneider
wrote:
>
>> On 12 Dec 2017, at 00:34, SZEDER Gábor wrote:
>>
>> While the build logic was embedded in our '.travis.yml', Travis CI
>> used to produce a nice trace log including all commands executed in
>> those embedded scriptlets. Since 657343a60
Kevin Daudt writes:
> Hello Hans Jerry,
>
> Thank you for your contribution. I have soem remarks below.
> ...
Thanks for a detailed review. I agree with all the things you
pointed out, and I see they are reflected in v2 of the series.
Very much appreciated; thanks, both.
Compiled test helpers in t/helper are out of sync with the .gitignore
files quite frequently. This can happen when new test helpers are added,
but the explicit .gitignore file is not updated in the same commit, or
when you forget to 'make clean' before checking out a different version
of git, as th
Hans Jerry Illikainen writes:
> +test_expect_success GPG 'pull unsigned commit with --verify-signatures' '
> + test_must_fail git pull --ff-only --verify-signatures unsigned
> 2>pullerror &&
> + test_i18ngrep "does not have a GPG signature" pullerror
> +'
Note that this is without "when
Lars Schneider writes:
>> You're right, it's my first time using travis CI and I got confused
>> about how the .travis.yml works, thanks for catching that. Will
>> re-phrase the commit message.
>
> Szeder is spot on. If you fix up the message, then this patch looks
> perfect! Pragmatic (= very g
Lars Schneider writes:
> Our favorite is "treat-encoding-as". Do you consider this better
> or worse than "checkout-encoding"?
I am afraid that "treat as" is not sufficiently specific and would
invite a misinterpretation, e.g. "You record the bytes I throw at
you as-is in the object store, but t
Ævar Arnfjörð Bjarmason writes:
> My "Makefile: replace perl/Makefile.PL with simple make rules" currently
> cooking in pu changes that so that:
>
> * We always at runtime test for the system CPAN module.
>
> * In the case of Error.pm we happen to ship a fallback, in the case of
>Mail::Addr
Jacob Keller writes:
>> I actually thought that the plan was "you either have this, or the
>> other one, never both at the same time" (and I think those who
>> pushed the XDG thing in to the system made us favor it over the
>> traditional one). So as long as --global updates the one that
>> exis
Jacob Keller writes:
> --global::
> + For writing options: write to global user configuration file
> + rather than the repository `.git/config`.
> +
> +For reading options: read only from global user configuration file
> +rather than from all available files.
> +
> See also <>.
OK.
Ramsay Jones writes:
> Signed-off-by: Ramsay Jones
> ---
>
> Hi Junio,
>
> Could you please add (or squash) this on top of the 'ab/sha1dc-build'
> branch, so that I can build with NO_DC_SHA1_SUBMODULE=NoThanks in my
> config.mak.
Makes sense. The patch looks scary by appearing to move the
incl
This series removes the remaining users of the index compatibility macros and
ensures that future uses of the macros will result in compiler errors.
Brandon Williams (3):
submodule: convert stage_updated_gitmodules to take a struct
index_state
submodule: used correct index in is_staging_gi
Commit 883e248b8 (fsmonitor: teach git to optionally utilize a file
system monitor to speed up detecting new or changed files., 2017-09-22)
introduced a call to 'ce_match_stat()' in 'is_staging_gitmodules_ok()'
which implicitly relys on the the global 'the_index' instead of the
passed in 'struct in
Instead of implicitly relying on the global 'the_index', convert
'get_next_submodule()' to use the index of the repository stored in the
callback data 'struct submodule_parallel_fetch'.
Since this removes the last user of the index compatibility macros,
define 'NO_THE_INDEX_COMPATIBILITY_MACROS' t
Signed-off-by: Brandon Williams
---
builtin/mv.c | 2 +-
builtin/rm.c | 2 +-
submodule.c | 4 ++--
submodule.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index ffdd5f01a..cf3684d90 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -291,7 +2
Junio C Hamano writes:
> Makes sense. The patch looks scary by appearing to move the
> includes far to the front of the Makefile, but it in fact is moving
> the NO_DC_SHA1_SUBMODULE block slightly down and it is a sensible
> and safe move.
A completely unrelated tangent. This was a good change
Stefan Beller writes:
> Compiled test helpers in t/helper are out of sync with the .gitignore
> files quite frequently. This can happen when new test helpers are added,
> but the explicit .gitignore file is not updated in the same commit, or
> when you forget to 'make clean' before checking out a
On Tue, Dec 12, 2017 at 11:53 AM, Brandon Williams wrote:
> This series removes the remaining users of the index compatibility macros and
> ensures that future uses of the macros will result in compiler errors.
Thanks for converting the submodule code to avoid these old macros.
Specifically the s
On 12/12, Junio C Hamano wrote:
> Lars Schneider writes:
>
> >> You're right, it's my first time using travis CI and I got confused
> >> about how the .travis.yml works, thanks for catching that. Will
> >> re-phrase the commit message.
> >
> > Szeder is spot on. If you fix up the message, then t
On Tue, Dec 12, 2017 at 2:53 PM, Brandon Williams wrote:
> Commit 883e248b8 (fsmonitor: teach git to optionally utilize a file
> system monitor to speed up detecting new or changed files., 2017-09-22)
> introduced a call to 'ce_match_stat()' in 'is_staging_gitmodules_ok()'
> which implicitly relys
Stefan Beller writes:
> ... would call out patch 2 to be a bugfix that could
> go independently, but the whole series is fine as-is with me.
Good eyes.
I agree that it makes sense to treat 2/3 as a follow-up fix for an
already graduated topic, and make the other two depend on a result
of appl
Brandon Williams writes:
> This series removes the remaining users of the index compatibility macros and
> ensures that future uses of the macros will result in compiler errors.
Nice. Will queue.
Thanks.
Thomas Gummerer writes:
>
> The breakages wen the split-index code fails tend to break things in
> much more obvious manners than a wrong message, usually git ends up
> dying if it gets broken. Both of the bugs that were fixed here would
> have been caught with the change in my patch.
>
> But ye
Compiled test helpers in t/helper are out of sync with the .gitignore
files quite frequently. This can happen when new test helpers are added,
but the explicit .gitignore file is not updated in the same commit, or
when you forget to 'make clean' before checking out a different version
of git, as th
Stefan Beller writes:
> Yes, there is also one lonely shell script in there, which also needs
> exclusion.
Thanks for catching them.
> +*
> +!.sh
> +!.[ch]
I'd use this instead, though.
-- >8 --
*
!*.sh
!*.[ch]
!*.gitignore
-- 8< --
In a dirty repository full of crufts but without any local
Hi Stefan,
Stefan Beller wrote:
>> If we ignore everything but resurrect *.[ch] with negative exclude
>> rules, can we do the same without moving things around?
>
> Yes, there is also one lonely shell script in there, which also needs
> exclusion.
There aren't currently any .h files, but I suppo
On Tue, Dec 12, 2017 at 8:53 PM, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Signed-off-by: Ramsay Jones
>> ---
>>
>> Hi Junio,
>>
>> Could you please add (or squash) this on top of the 'ab/sha1dc-build'
>> branch, so that I can build with NO_DC_SHA1_SUBMODULE=NoThanks in my
>> config.mak.
On Tue, 12 Dec 2017 11:57:28 -0800
Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Makes sense. The patch looks scary by appearing to move the
> > includes far to the front of the Makefile, but it in fact is moving
> > the NO_DC_SHA1_SUBMODULE block slightly down and it is a sensible
> >
On Tue, Dec 12 2017, Junio C. Hamano jotted:
> Ævar Arnfjörð Bjarmason writes:
>
>> My "Makefile: replace perl/Makefile.PL with simple make rules" currently
>> cooking in pu changes that so that:
>>
>> * We always at runtime test for the system CPAN module.
>>
>> * In the case of Error.pm we h
-Original Message-
On December 10, 2017 4:14 PM, Ævar Arnfjörð Bjarmason wrote:
Subject: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules
>Replace the perl/Makefile.PL and the fallback perl/Makefile used under
>NO_PERL_MAKEMAKER=NoThanks with a much simpler implementat
Olga Telezhnaya writes:
> builtin/notes.c | 2 +-
> builtin/reset.c | 2 +-
> builtin/show-branch.c | 2 +-
> commit.h | 81 +--
> pretty.h | 87
> +++
> revision
Ævar Arnfjörð Bjarmason writes:
> Ripping out Error.pm for our few internal callers is one thing, trying
> to maintain bugwards compatibility with how it throws exceptions for
> users expecting Error.pm objects is another. I think at that point it's
> easier to just stay with Error.pm.
>
> Probab
Ævar Arnfjörð Bjarmason writes:
>> I actually think that the block can go even further down, perhaps
>> close to the run of choices "what variant are we building?" we make
>> at around we have "ifdef NO_CURL".
>>
>> Ævar?
>
> Makes sense to me, do you want to squash this + your proposed edit &
>
On Tue, Dec 12 2017, Randall S. Becker jotted:
> -Original Message-
> On December 10, 2017 4:14 PM, Ævar Arnfjörð Bjarmason wrote:
> Subject: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules
>
>>Replace the perl/Makefile.PL and the fallback perl/Makefile used under
>>
Junio C Hamano writes:
> Ævar Arnfjörð Bjarmason writes:
>
>>> I actually think that the block can go even further down, perhaps
>>> close to the run of choices "what variant are we building?" we make
>>> at around we have "ifdef NO_CURL".
>>>
>>> Ævar?
>>
>> Makes sense to me, do you want to sq
After commit 0d0bac67ce3b ("transport: drop support for git-over-rsync",
2016-02-01), no transport in Git populates the "push" entry in the
transport vtable. Remove this entry.
Signed-off-by: Jonathan Tan
---
I was taking a look at the transport code and noticed that push is
unused (and push_refs
"Randall S. Becker" writes:
> Sorry about the response positioning...
>
> I can send you a pull request on github, if you want 😉
I don't. It's not that I can or cannot take a pull request. I just
do not want to queue anything that is not reviwed on list.
I however could queue this (typed to m
On Tue, Dec 12 2017, Junio C. Hamano jotted:
> Junio C Hamano writes:
>
>> Ævar Arnfjörð Bjarmason writes:
>>
I actually think that the block can go even further down, perhaps
close to the run of choices "what variant are we building?" we make
at around we have "ifdef NO_CURL".
>
-Original Message-
On December 12, 2017 6:18 PM Junio C Hamano wrote:
Subject: Re: [Proposed] Externalize man/html ref for quick-install-man and
quick-install-html
>"Randall S. Becker" writes:
>> I can send you a pull request on github, if you want 😉
>I don't. It's not that I can or cann
From: "Jeff Hostetler"
From: Jeff Hostetler
First draft of design document for partial clone feature.
Signed-off-by: Jeff Hostetler
Signed-off-by: Jonathan Tan
---
Documentation/technical/partial-clone.txt | 240
++
1 file changed, 240 insertions(+)
create mode
"Randall S. Becker" writes:
> Yes, needed. The lines wrapped om Documentation/Makefile - each
> change in quick-install-man/html should be exactly one line:
>
> quick-install-man: require-manrepo
> - '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO)
> $(DESTDIR)$(mandir)
> + '$(SHELL
On December 12, 2017 6:40 PM Junio C Hamano wrote to my own embarrassment:
"Randall S. Becker" writes:
>> Yes, needed. The lines wrapped om Documentation/Makefile - each change
>> in quick-install-man/html should be exactly one line:
>>
>> quick-install-man: require-manrepo
>> -'$(SHELL_PATH
"Philip Oakley" writes:
>> + These filtered packfiles are incomplete in the traditional sense
>> because
>> + they may contain trees that reference blobs that the client does
>> not have.
>
> Is a comment needed here noting that currently, IIUC, the complete
> trees are fetched in the packfiles
On Tue, Dec 12, 2017 at 03:10:56PM -0800, Jonathan Tan wrote:
> After commit 0d0bac67ce3b ("transport: drop support for git-over-rsync",
> 2016-02-01), no transport in Git populates the "push" entry in the
> transport vtable. Remove this entry.
Yay. Thanks for cleaning this up.
-Peff
Elijah Newren writes:
> This patchset introduces directory rename detection to merge-recursive.
The use of negated form of test_i18ngrep in these patches are all
wrong. Because the helper must say "even though the string does not
match (does match), the test expects it to match (does not match)
OK, it seems that I managed to make this test pass under poison build
(see https://travis-ci.org/git/git/jobs/315658242)
Please check
https://github.com/git/git/commit/e5c5e24ad91a75b5a70c056fe6c6e3bfb55b56fc
and sprinkle its fix to whichever original commits in the series that
need fixing.
Than
Change the documentation of git-add so that it consistently uses
the phrase "staging area". The current git documentation uses
inconsistent terminology ("index", "cache", and "staging area").
This commit switches git-add's documentation to consistently use
the phrase "staging area", which is highe
On Tue, Dec 12, 2017 at 11:36 AM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>>> I actually thought that the plan was "you either have this, or the
>>> other one, never both at the same time" (and I think those who
>>> pushed the XDG thing in to the system made us favor it over the
>>> tradit
On Tue, Dec 12, 2017 at 6:13 AM, Yaroslav Halchenko wrote:
>
> On Mon, 11 Dec 2017, Junio C Hamano wrote:
>
>> Jonathan Nieder writes:
>
>> > I think the documentation
>
>> > ~/.gitconfig
>> > User-specific configuration file. Also called "global"
>> > configuration fi
On Tue, Dec 12, 2017 at 7:20 AM, Todd Zullinger wrote:
> Hi Jacob,
>
> Jacob Keller wrote:
>> The documentation for git config and how it reads the user specific
>> configuration file is misleading. In some places it implies that
>> $XDG_CONFIG_HOME/git/config will always be read. In others, it im
On Tue, Dec 12, 2017 at 11:47 AM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> --global::
>> + For writing options: write to global user configuration file
>> + rather than the repository `.git/config`.
>> +
>> +For reading options: read only from global user configuration file
>>
On Tue, Dec 12, 2017 at 6:32 PM, David A. Wheeler wrote:
> Change the documentation of git-add so that it consistently uses
> the phrase "staging area". The current git documentation uses
> inconsistent terminology ("index", "cache", and "staging area").
> This commit switches git-add's documenta
On December 13, 2017 12:40:12 AM EST, Jacob Keller
wrote:
>I know we've used various terms for this concept across a lot of the
>documentation. However, I was under the impression that we most
>explicitly used "index" rather than "staging area".
I think "staging area" is the better term. It focu
79 matches
Mail list logo
