This fixes `add` and `pull` for GPG signed objects.
Signed-off-by: Stephen R Guglielmo
---
contrib/subtree/git-subtree.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index
git respects XDG_CACHE_HOME for the credential cache. So, we should
unset XDG_CACHE_HOME for the test environment, lest a user's custom one
cause failure in the test.
For example, t/t0301-credential-cache.sh expects a default directory
to be used if it hasn't explicitly set XDG_CACHE_HOME.
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index ab0580ce0089a..4ac175c49e80c 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> + /*
> + * Check if we are bisecting
> + */
> + if
This is a very naive attempt at teaching git cherry to restrict
attention to a given pathspec. Very much RFC, hence no documentation
update or test cases for now.
The first problem is the existing signature, with between 0 and 3
arguments. In order to preserve having defaults for limit, head,
On Wed, Jan 31, 2018 at 12:25 AM, Elijah Newren wrote:
> This commit hooks together all the directory rename logic by making the
> necessary changes to the rename struct, it's dst_entry, and the
> diff_filepair under consideration.
>
> Signed-off-by: Elijah Newren
On Thu, Feb 15, 2018 at 5:45 PM, Junio C Hamano wrote:
> [...]
> Update the default (again) for "git merge" that merges a tag object
> to (1) --no-ff (i.e. create a merge commit even when side branch
> fast forwards) if the tag being merged is not at its expected place
> in
Although "git worktree add" learned to run the 'post-checkout' hook in
ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it
neglected to change to the directory of the newly-created worktree
before running the hook. Instead, the hook runs within the directory
from which the "git
On Thu, Feb 15, 2018 at 4:27 PM, Eric Sunshine wrote:
> On Thu, Feb 15, 2018 at 12:52:11PM -0800, Junio C Hamano wrote:
>> This seems to segfault on me, without leaving hook.actual anywhere.
>
> I'm unable to reproduce the segfault, but I'm guessing it's because
> I'm a
Long time ago at fab47d05 ("merge: force edit and no-ff mode when
merging a tag object", 2011-11-07), "git merge" was made to always
create a merge commit when merging a tag, even when the side branch
being merged is a descendant of the current branch.
This default is good for merges made by
On Thu, Feb 15, 2018 at 10:56:15PM +0100, Rasmus Villemoes wrote:
> There is only one instance of grep_source_init(GREP_SOURCE_FILE), and in
> that case the path and identifier arguments are equal - not just as
> strings, but the same pointer is passed. So we can save some time and
> memory by
On Thu, Feb 15, 2018 at 10:56:13PM +0100, Rasmus Villemoes wrote:
> grep_source_init typically does three strdup()s, and in the threaded
> case, the call from add_work() happens while holding grep_mutex.
>
> We can thus reduce the time we hold grep_mutex by moving the
> grep_source_init() call
On Thu, Feb 15, 2018 at 12:03:06PM -0800, Junio C Hamano wrote:
> And from that point of view, perhaps w-t-e attribute is somewhat
> misdesigned.
>
> In general, an attribute is about the project's contents in the
> manner independent of platform or environment. You define "this
> file is a C
Hervé Beraud writes:
> ---
Thanks for posting, but this is way under-justified, even for
something in contrib/ area.
Are all changes in this patch necessary to "make it compatible with
both Python 2 and 3", or are some parts do not contribute directly
to the
On 02/15, Rasmus Villemoes wrote:
> I believe the first two should be ok, but I'm not sure what I myself
> think of the third one. Perhaps the saving is not worth the
> complexity, but it does annoy my optimization nerve to see all the
> unnecessary duplicated work being done.
I agree, the first
grep_source_init typically does three strdup()s, and in the threaded
case, the call from add_work() happens while holding grep_mutex.
We can thus reduce the time we hold grep_mutex by moving the
grep_source_init() call out of add_work(), and simply have add_work()
copy the initialized structure
I believe the first two should be ok, but I'm not sure what I myself
think of the third one. Perhaps the saving is not worth the
complexity, but it does annoy my optimization nerve to see all the
unnecessary duplicated work being done.
Rasmus Villemoes (3):
grep: move grep_source_init outside
In the NO_PTHREADS or !num_threads case, this doesn't change
anything. In the threaded case, note that grep_source_init duplicates
its third argument, so there is no need to keep [path]buf.buf alive
across the call of add_work().
Signed-off-by: Rasmus Villemoes
---
There is only one instance of grep_source_init(GREP_SOURCE_FILE), and in
that case the path and identifier arguments are equal - not just as
strings, but the same pointer is passed. So we can save some time and
memory by reusing the gs->path = xstrdup_or_null(path) we have already
done as
On Thu, Feb 15, 2018 at 1:16 PM, Junio C Hamano wrote:
> I think the message you are referring to is a tangent that discusses
> how it was done in the old world, with issues that come from the
> fact that with such an approach the paths are first removed from the
> index and
Eric Sunshine writes:
> I'm a dummy. Can you squash in the following and retry?
I haven't tried, but that does look like the right thing to do,
whether it is the root cause of the fault I am seeing.
Thanks.
>
> --- >8 ---
> diff --git a/builtin/worktree.c
Ævar Arnfjörð Bjarmason writes:
> On Wed, Feb 14 2018, Jonathan Nieder jotted:
>
>> Ævar Arnfjörð Bjarmason wrote:
>>
>>> --- a/perl/Git.pm
>>> +++ b/perl/Git.pm
>>> @@ -1324,8 +1324,9 @@ sub _temp_cache {
>>> }
>>>
>>> sub _verify_require {
>>> - eval { require File::Temp;
On Thu, Feb 15, 2018 at 12:52:11PM -0800, Junio C Hamano wrote:
> Eric Sunshine writes:
> > test_expect_success '"add" invokes post-checkout hook (branch)' '
> > post_checkout_hook &&
> > - printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
> > + {
>
[I dropped bbour...@slb.com from the Cc: list, as it bounced
on my previous reply.]
Ævar Arnfjörð Bjarmason wrote:
> That makes sense, I'll incorporate that in a re-roll. I like
> NO_PERL_CPAN_FALLBACKS or just NO_CPAN_FALLBACKS better.
Either is an improvement. Starting with NO_PERL_ seems
Do you need funding * Business loans * Personal loans without stress and quick
approval? We offer loan at low
interest rate,for more information contact us via email.
Chris J.G
Financier/Mund-Worth FS
On Thu, Feb 15, 2018 at 12:42 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> This is a real take on the first part of the recent RFC[1].
>
> For the patches remaining in this series, The scope is about right
> and the size is more manageable.
ok,
Eric Sunshine writes:
> test_expect_success '"add" invokes post-checkout hook (branch)' '
> post_checkout_hook &&
> - printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
> + {
> + echo $_z40 $(git rev-parse HEAD) 1 &&
> +
On Wed, Feb 14 2018, Jonathan Nieder jotted:
> Ævar Arnfjörð Bjarmason wrote:
>
>> The Error.pm shipped with Git as a fallback if there was no Error.pm
>> on the system was released in April 2006, there's been dozens of
>> releases since then, the latest at August 7, 2017, let's update to
>>
On Wed, Feb 14 2018, Jonathan Nieder jotted:
> Ævar Arnfjörð Bjarmason wrote:
>
>> The Net::SMTP and Net::Domain were both first released with perl
>> v5.7.3, since my d48b284183 ("perl: bump the required Perl version to
>> 5.8 from 5.6.[21]", 2010-09-24) we've depended on 5.8, so there's no
>>
On Wed, Feb 14 2018, Jonathan Nieder jotted:
> Ævar Arnfjörð Bjarmason wrote:
>
>> --- a/perl/Git.pm
>> +++ b/perl/Git.pm
>> @@ -1324,8 +1324,9 @@ sub _temp_cache {
>> }
>>
>> sub _verify_require {
>> -eval { require File::Temp; require File::Spec; };
>> -$@ and throw
Stefan Beller writes:
> This is a real take on the first part of the recent RFC[1].
For the patches remaining in this series, The scope is about right
and the size is more manageable. With topics already on 'master',
they have some interactions:
- ot/mru-on-list &
On Thu, Feb 15 2018, Todd Zullinger jotted:
> Hi Ævar,
>
> Ævar Arnfjörð Bjarmason wrote:
>> +Git::LoadCPAN - Wrapper for loading modules from the CPAN (OS) or Git's own
>> copy
>> +
>> +=head1 DESCRIPTION
>> +
>> +The Perl code in Git depends on some modules from the CPAN, but we
>> +don't
On Thu, Feb 15 2018, Matthieu Moy jotted:
> "Jonathan Nieder" wrote:
>
>> Ævar Arnfjörð Bjarmason wrote:
>>
>> > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan
>> > 23, 2018). This should be a trivial update[1] but it seems the version
>> > Matthieu
lars.schnei...@autodesk.com writes:
> -- Git clients that do not support the `working-tree-encoding` attribute
> - will checkout the respective files UTF-8 encoded and not in the
> - expected encoding. Consequently, these files will appear different
> - which typically causes trouble. This is
Although "git worktree add" learned to run the 'post-checkout' hook in
ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it
neglected to change to the directory of the newly-created worktree
before running the hook. Instead, the hook runs within the directory
from which the "git
Robert Dailey writes:
> On Tue, Oct 3, 2017 at 9:00 PM, Junio C Hamano wrote:
>> Torsten Bögershausen writes:
>>
$ git rm -r --cached . && git add .
>>>
>>> (Both should work)
>>>
>>> To be honest, from the documentation, I can't
Stefan Beller writes:
> It is possible to have the output ' A' from 'git status --porcelain'
> by adding a file using the '--intend-to-add' flag. Make this clear by
> adding the pattern in the table of the documentation.
>
> However the mode 'DM' (deleted in the index,
Ævar Arnfjörð Bjarmason writes:
> In general I'm mildly negative on adding this, for every user like Doron
> who'll be less confused by a hack like this, you'll have other users
> who'll be confused about git inexplicably working with ~ in the middle
> of strings, even though;
On Tue, Oct 3, 2017 at 9:00 PM, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
>>> $ git rm -r --cached . && git add .
>>
>> (Both should work)
>>
>> To be honest, from the documentation, I can't figure out the difference
>> between
>> $ git read-tree
Оля Тележная writes:
>>> - else if (deref)
>>> + } else if (!strcmp(name, "objectsize:disk")) {
>>> + if (cat_file_info.is_cat_file) {
>>> + v->value = cat_file_info.disk_size;
>>> +
Derrick Stolee writes:
> +struct object_id *get_nth_commit_oid(struct commit_graph *g,
> + uint32_t n,
> + struct object_id *oid)
> +{
> + hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * n);
> +
On 2/15/2018 1:19 PM, Junio C Hamano wrote:
Derrick Stolee writes:
+struct packed_oid_list {
+ struct object_id **list;
+ int nr;
+ int alloc;
+};
What is the typical access pattern for this data structure? If it
is pretty much "allocate and grow as we
Derrick Stolee writes:
> +struct packed_oid_list {
> + struct object_id **list;
> + int nr;
> + int alloc;
> +};
What is the typical access pattern for this data structure? If it
is pretty much "allocate and grow as we find more", then a dynamic
array of struct
From: Lars Schneider
Hi,
Patches 1-4, 6 are preparation and helper functions.
Patch 5,7 are the actual change.
This series depends on Torsten's 8462ff43e4 (convert_to_git():
safe_crlf/checksafe becomes int conv_flags, 2018-01-13) which is already
in master.
Changes
From: Lars Schneider
Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we
allocate the buffer for the lower case string with xmallocz(). This
already ensures a NUL at the end of the allocated buffer.
Remove the unnecessary assignment.
Signed-off-by:
From: Lars Schneider
Create a copy of an existing string and make all characters upper case.
Similar xstrdup_tolower().
This function is used in a subsequent commit.
Signed-off-by: Lars Schneider
---
strbuf.c | 12
strbuf.h |
From: Lars Schneider
Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE
or UTF-32LE a BOM must not be used [1]. The function returns true if
this is the case.
This function is used in a subsequent commit.
[1]
From: Lars Schneider
If the endianness is not defined in the encoding name, then let's
be strict and require a BOM to avoid any encoding confusion. The
is_missing_required_utf_bom() function returns true if a required BOM
is missing.
The Unicode standard instructs to
From: Lars Schneider
Git recognizes files encoded with ASCII or one of its supersets (e.g.
UTF-8 or ISO-8859-1) as text files. All other encodings are usually
interpreted as binary and consequently built-in Git text processing
tools (e.g. 'git diff') as well as most Git
From: Lars Schneider
UTF supports lossless conversion round tripping and conversions between
UTF and other encodings are mostly round trip safe as Unicode aims to be
a superset of all other character encodings. However, certain encodings
(e.g. SHIFT-JIS) are known to
From: Lars Schneider
Add the GIT_TRACE_WORKING_TREE_ENCODING environment variable to enable
tracing for content that is reencoded with the 'working-tree-encoding'
attribute. This is useful to debug encoding issues.
Signed-off-by: Lars Schneider
Ævar Arnfjörð Bjarmason writes:
> On Thu, Feb 15 2018, SZEDER Gábor jotted:
>
>> Since commit 20d2a30f8f (Makefile: replace perl/Makefile.PL with
>> simple make rules, 2017-12-10), the Git(3pm) man page is only
>> generated as an indirect dependency of the 'install-doc' and
>>
Johannes Schindelin writes:
> } else {
> - if (!starts_with(line, "/dev/null\n"))
> + if (!is_dev_null(line))
> return error(_("git apply: bad git-diff - expected
> /dev/null on line %d"), state->linenr);
> }
On Thu, Feb 15, 2018 at 5:52 PM, Jeff King wrote:
> On Thu, Feb 15, 2018 at 05:39:28PM +0100, SZEDER Gábor wrote:
>
>> On Tue, Feb 13, 2018 at 11:22 PM, Jeff King wrote:
>>
>> >> for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl";
>> >> do
>>
Hi Michael,
On Wed, 24 Jan 2018, Michael Haggerty wrote:
> This patch series fixes the handling of empty packed-refs snapshots
> (i.e., those with `snapshot->buf` and friends equal to `NULL`), partly
> by changing `snapshot` to store a pointer to the start of the
> post-header `packed-refs`
On Thu, Feb 15, 2018 at 05:39:28PM +0100, SZEDER Gábor wrote:
> On Tue, Feb 13, 2018 at 11:22 PM, Jeff King wrote:
>
> >> for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl";
> >> do
> >> test_expect_success "more than one quoting style: $i" "
> >> -
Hello dear ,
I am Mr. Jeremiah Bworo , nationality of Ethiopia but currently In Benin
Republic as a Principal Director with Federal Ministry Of Works and Housing
here .
I will be delighted to invest with you there in your country into lucrative
investments under your management as far as you
Hi,
On Thu, 15 Feb 2018, Sergey Organov wrote:
> Johannes Schindelin writes:
>
> > On Tue, 13 Feb 2018, Sergey Organov wrote:
> >
> >> Johannes Schindelin writes:
> >>
> >> > The wording is poor either way, but you are also not a native
Hello dear ,
I am Mr. Jeremiah Bworo , nationality of Ethiopia but currently In Benin
Republic as a Principal Director with Federal Ministry Of Works and Housing
here .
I will be delighted to invest with you there in your country into lucrative
investments under your management as far as you
Hi,
On Thu, 15 Feb 2018, Sergey Organov wrote:
> Johannes Schindelin writes:
>
> [...]
>
> >> > I'd not argue this way myself. If there are out-of-git-tree non-human
> >> > users that accept and tweak todo _generated_ by current "git rebase -p"
> >> > _command_, I
On Tue, Feb 13, 2018 at 11:22 PM, Jeff King wrote:
>> for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do
>> test_expect_success "more than one quoting style: $i" "
>> - git for-each-ref $i 2>&1 | (read line &&
>> - case
Hi,
I was wondering if you would be interested in targeting a customized list
of your competitors End Users Install Base for your upcoming Marketing
Strategy.
• ERP- JD Edwards, Infor Baan, SAP, Exact Software, NetSuite, PeopleSoft,
etc.
• CRM- Salesforce, MS Dynamics, NetSuite, Siebel,
On Thu, Feb 15, 2018 at 01:01:14PM +0100, Jan Nguyen wrote:
> I would like to ask how can I uninstall Git?
Please follow the answers given to this question at
https://apple.stackexchange.com/search?q=%5Bgit%5D+uninstall
Hi Jake,
On Wed, 14 Feb 2018, Jacob Keller wrote:
> On Wed, Feb 14, 2018 at 5:50 PM, Psidium Guajava wrote:
> > 2018-02-14 22:53 GMT-02:00 Johannes Schindelin :
> >> Now, when is the next possible time you can call `git rebase --undo-skip`?
> >
>
Hi Jake,
On Wed, 14 Feb 2018, Jacob Keller wrote:
> On Wed, Feb 14, 2018 at 4:53 PM, Johannes Schindelin
> wrote:
> >
> > On Wed, 14 Feb 2018, Psidium Guajava wrote:
> >
> >> On 2018-02-13 18:42 GMT-02:00 Stefan Beller wrote:
> >> > On Tue, Feb
Hello there,
I would like to ask how can I uninstall Git?
Kind regards
Jan
---
contrib/hg-to-git/hg-to-git.py | 140 -
1 file changed, 83 insertions(+), 57 deletions(-)
diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
index de3f81667ed97..9b0842c3883dc 100755
--- a/contrib/hg-to-git/hg-to-git.py
+++
2018-02-15 8:57 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Add tests for new formatting atoms: rest, deltabase, objectsize:disk.
>> rest means nothing and we expand it into empty string.
>> We need this atom for cat-file command.
>>
2018-02-15 8:56 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> cat-file options are now filled by general logic.
>
> Yay.
>
> One puzzling thing:
>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index 8d104b567eb7c..5781416cf9126 100644
2018-02-15 8:53 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Remove connection between expand_data variable
>> in cat-file and in ref-filter.
>> It will help further to get rid of using expand_data in cat-file.
>
> I have to admit I'm
2018-02-15 8:51 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Move logic related to skip_object_info into ref-filter,
>> so that cat-file does not use that field at all.
>
> I think this is going the wrong way. ref-filter should always
2018-02-15 8:49 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Delete all items related to split_on_whitespace from ref-filter
>> and add new function for handling the logic.
>> Now cat-file could invoke that function to implementing
2018-02-15 8:45 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Remove mark_atom_in_object_info() and create same logic
>> in terms of ref-filter style.
>
> This one is definitely a step in the right direction. In fact, this is
> what I
2018-02-15 8:40 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Moving from using expand_data to ref_array_item structure.
>> That helps us to reuse functions from ref-filter easier.
>
> This one feels weird. The point of a
2018-02-15 8:37 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Continue migrating formatting logic from cat-file to ref-filter.
>> Reuse parse_ref_filter_atom() for unifying all processes in ref-filter
>> and further removing of
hola Mi nombre es Vanessa Ali. a France Nationality, soy viuda,
actualmente hospitalizada debido a una enfermedad de cáncer. Mientras
tanto, he decidido donar mi fondo para usted como una persona
confiable que usará este dinero sabiamente, € 2,800,000 Millones de
Euros. para ayudar a los pobres y
Hi Gabriel,
On Wed, Feb 14, 2018 at 4:42 AM, Stefan Beller wrote:
> On Tue, Feb 13, 2018 at 12:22 PM, Psidium Guajava wrote:
>>
>> Also, a little unrelated with this issue:
>> 5. What happened to the rewrite of rebase in C [2]? I couldn't find
>> any
2018-02-15 8:23 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Make valid_atom as a function parameter,
>> there could be another variable further.
>> Need that for further reusing of formatting logic in cat-file.c.
>>
>> We do not need
2018-02-15 8:16 GMT+03:00 Jeff King :
> On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote:
>
>> Add return flag to format_ref_array_item(), show_ref_array_item(),
>> get_ref_array_info() and populate_value() for further using.
>> Need it to handle situations when item
"Jonathan Nieder" wrote:
> Ævar Arnfjörð Bjarmason wrote:
>
> > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan
> > 23, 2018). This should be a trivial update[1] but it seems the version
> > Matthieu Moy imported in bd869f67b9 ("send-email: add and use
On Thu, Feb 15 2018, SZEDER Gábor jotted:
> Since commit 20d2a30f8f (Makefile: replace perl/Makefile.PL with
> simple make rules, 2017-12-10), the Git(3pm) man page is only
> generated as an indirect dependency of the 'install-doc' and
> 'install-man' Makefile targets. Consequently, if someone
80 matches
Mail list logo