Avoid a magic number of NULL placeholder values and a magic index by
constructing the command line for pack-objects using the embedded
argv_array of the child_process. The resulting code is shorter and
easier to extend.
Signed-off-by: Rene Scharfe
---
send-pack.c | 28 +-
Avoid a strangely magic array size (it's slightly too big) and explicit
index numbers by building the command line for index-pack using the
embedded argv_array of the child_process. The resulting code is shorter
and easier to extend.
Signed-off-by: Rene Scharfe
---
http.c | 12
1 f
Greetings from Dr. mohammad ouattara.
Assalamu`Alaikum.
My Name is Dr. mohammad ouattara, I am a banker by profession. I'm from
Ouagadougou, Burkina Faso, West Africa. My reason for contacting you is to
transfer an abandoned $14.6M to your account.
The owner of this fund died since 2004 wit
On Fri, Dec 22, 2017 at 3:14 AM, René Scharfe wrote:
> Avoid a strangely magic array size (it's slightly too big) and explicit
> index numbers by building the command line for index-pack using the
> embedded argv_array of the child_process. The resulting code is shorter
> and easier to extend.
>
>Original Message
>From: kaartic.sivar...@gmail.com
>Date: 21/12/2017 17:14
>To: "phillip.w...@talktalk.net", "Phillip
Wood", "Git Mailing List"
>Cc: "Johannes Schindelin"
>Subj: Re: Error in `git': free(): invalid pointer (was Re: [PATCH]
sequencer: improve config handling)
>
>On Thu, 2
In Git's source code, we have this convention that quite a few data
structures can be initialized using a macro *_INIT while defining an
instance (instead of having to call a function to initialize the data
structure). You will see that idiom quite a bit, e.g. `struct strbuf buf
= STRBUF_INIT;`
Th
Hi Kaartic,
On Thu, 21 Dec 2017, Kaartic Sivaraam wrote:
> Speaking of trace, (thanks to Dscho!) the one I got using 'valgrind'
> (with `--leak-check=full` option) can be found below. I've kept only
> relevant parts of it to avoid unwanted noise of `set -x`. Let me know
> if that's needed too.
>
The gpg_sign member of the replay_opts structure is of type `char *`,
meaning that the sequencer deems the string to which gpg_sign points to
be under its custody, i.e. it needs to be free()d by the sequencer.
Therefore, let's only assign malloc()ed buffers to it.
Reported-by: Kaartic Sivaraam
S
Avoid a strangely magic array size (it's slightly too big) and explicit
index numbers by building the command line for index-pack using the
embedded argv_array of the child_process. Add the flag -o and its
argument with argv_array_pushl() to make it obvious that they belong
together. The resultin
>Original Message
>From: johannes.schinde...@gmx.de
>Date: 22/12/2017 11:50
>To:
>Cc: "Junio C Hamano", "Phillip Wood", "Kaartic Sivaraam"
>Subj: [PATCH] sequencer: assign only free()able strings to gpg_sign
>
>The gpg_sign member of the replay_opts structure is of type `char *`,
>meani
The untracked cache gets confused when a directory is swapped out for
a symlink to another directory. Whatever files are inside the target
of the symlink will be incorrectly shown as untracked. This issue does
not happen if the symlink links to another file, only if it links to
another directory.
> Can you show the output of "git remote"
# in usb_subfolder
$git remote
origin
$
#in home_subfolder
$git remote
$
> and also
> clearly explain with details the layout of what the folders are and
> what is or is not a repository?
Take the following update into consideration and then reread my f
Here's a hopefully ready to apply v2 incorporating feedback from Eric
(thanks!). A tbdiff with v1 follows below.
Ævar Arnfjörð Bjarmason (2):
commit doc: document that -c, -C, -F and --fixup with -m error
commit: add support for --fixup -m""
Documentation/git-commit.txt | 2 ++
builtin/comm
Document that providing any of -c, -C, -F and --fixup along with -m
will result in an error. Some variant of this has been errored about
explicitly since 0c091296c0 ("git-commit: log parameter updates.",
2005-08-08), but the documentation was never updated to reflect this.
Wording-by: Eric Sunshin
On 12/22, Johannes Schindelin wrote:
> In Git's source code, we have this convention that quite a few data
> structures can be initialized using a macro *_INIT while defining an
> instance (instead of having to call a function to initialize the data
> structure). You will see that idiom quite a bit
Hi Phillip,
On Fri, 22 Dec 2017, phillip.w...@talktalk.net wrote:
> I thought the bug could be triggered when commit.gpgsign was true and
> it was not overriden on the commandline, is it worth adding a test for
> that?
Everybody working with extensive test suites seems to write/blog these
days
Git credential fails with special char in password.
remote: Invalid username or password.
fatal: Authentication failed for
File ~/.git-credential contains badly urlencoded characters
%ffXX%ffYY instead of %XX%YY.
Add a cast to an unsigned char to fix urlencode use of %02x
on a char.
Sign
On Fri, Dec 22, 2017 at 12:14 AM, René Scharfe wrote:
> Avoid a magic number of NULL placeholder values and a magic index by
> constructing the command line for pack-objects using the embedded
> argv_array of the child_process. The resulting code is shorter and
> easier to extend.
>
> Signed-off-
Stefan Beller writes:
> I was compiling origin/master today with the DEVELOPER compiler flags
> today and was greeted by
>
> t/helper/test-lazy-init-name-hash.c: In function ‘cmd_main’:
> t/helper/test-lazy-init-name-hash.c:172:5: error: ‘nr_threads_used’ may be
> used uninitialized in this func
> Heh; I do not think there particularly is much difference between
> stricter flags and DEVELOPER flags, but I would rather not lose the
> removal of duplicated 'today' I did while I queued the previous one
> ;-)
I did not realize it was queued anywhere, please ignore then.
Jonathan Nieder writes:
>> Created core.aheadbehind config setting and core_ahead_behind
>> global variable. This value defaults to true.
>>
>> This value will be used in the next few commits as the default value
>> for the --ahead-behind parameter.
>>
>> Signed-off-by: Jeff Hostetler
>> ---
>>
Johannes Schindelin writes:
>> I thought the bug could be triggered when commit.gpgsign was true and
>> it was not overriden on the commandline, is it worth adding a test for
>> that?
>
> ... If we want to verify that the
> gpg_sign is correctly allocated before it is free()d, then the test cas
"Carlsson, Magnus" writes:
> $ git fetch subrepo
> 50f730db793e0733b159326c5a3e78fd48cedfec:refs/remote/subrepo/foo-commit
> remote: Counting objects: 2311, done.
> remote: Total 2311 (delta 0), reused 0 (delta 0), pack-reused 2311
> -- >>> Receiving objects: 100% (2311/2311), 703.64 KiB | 0 byt
Ævar Arnfjörð Bjarmason writes:
> Signed-off-by: Ævar Arnfjörð Bjarmason
> ---
Thanks, but I thought the patch was already in 'next' for a week or
more and it's time to refine incrementally.
Here is the difference as I see between what we already have and
this update, and a proposed summary.
Stefan Beller writes:
> It turns out that this buggy test passed due to the buggy implementation,
> which will soon be corrected. Let's fix the test first.
Please clarify "buggy test". Without the original discussion (I am
imagining there is something that happened on the list recently),
here
On Fri, Dec 22, 2017 at 11:00 AM, Ævar Arnfjörð Bjarmason
wrote:
> Here's a hopefully ready to apply v2 incorporating feedback from Eric
> (thanks!). A tbdiff with v1 follows below.
>
> Ævar Arnfjörð Bjarmason (2):
> commit doc: document that -c, -C, -F and --fixup with -m error
> commit: add
Stefan Beller writes:
> The function same(a, b) is used to check if two entries a and b are the
> same. As the index contains the staged files the same() function can be
> used to check if files between a given revision and the index are the same.
>
> In case of submodules, the gitlink entry is
Stefan Beller writes:
> When using hard reset or forced checkout with the option to recurse into
> submodules, the submodules need to be reset, too.
>
> It turns out that we need to omit the duplicate old argument to read-tree
> in all forced cases to omit the 2 way merge and use the more asserti
Stefan Beller writes:
>> Heh; I do not think there particularly is much difference between
>> stricter flags and DEVELOPER flags, but I would rather not lose the
>> removal of duplicated 'today' I did while I queued the previous one
>> ;-)
>
>
> I did not realize it was queued anywhere, please ig
Stefan Beller writes:
>> + argv_array_push(&po.args, "pack-objects");
>> + argv_array_push(&po.args, "--all-progress-implied");
>> + argv_array_push(&po.args, "--revs");
>> + argv_array_push(&po.args, "--stdout");
>
> (useless nit of the day, no need to resend:)
> These fo
Brandon Williams writes:
>> -#define OIDMAP_INIT { { NULL } }
>> +/*
>> + * This macro initializes the data structure only incompletely, just enough
>> + * to call oidmap_get() on an empty map. Use oidmap_init() instead.
>> + */
>> +#define OIDMAP_INIT_INCOMPLETELY { { NULL } }
>
> This is one wa
Elijah Newren writes:
> builtin/merge.c contains this important requirement for merge strategies:
> /*
>* At this point, we need a real merge. No matter what strategy
>* we use, it would operate on the index, possibly affecting the
>* working tree, and when resolved
Add support for supplying the -m option with --fixup. Doing so has
errored out ever since --fixup was introduced. Before this, the only
way to amend the fixup message while committing was to use --edit and
amend it in the editor.
The use-case for this feature is one of:
* Leaving a quick note to
On Fri, Dec 22 2017, Eric Sunshine jotted:
> On Fri, Dec 22, 2017 at 11:00 AM, Ævar Arnfjörð Bjarmason
> wrote:
>> Here's a hopefully ready to apply v2 incorporating feedback from Eric
>> (thanks!). A tbdiff with v1 follows below.
>>
>> Ævar Arnfjörð Bjarmason (2):
>> commit doc: document that
Elijah Newren writes:
> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote:
>> index_has_changes() is a function we want to reuse outside of just am,
>> making it also available for merge-recursive and merge-ort.
>>
>> Signed-off-by: Elijah Newren
>> ---
>
> Note: These patches built on mast
Dave Borowitz writes:
> Unrecognized escape sequences are invalid in values:
>
> $ git config -f - --list < [foo]
> bar = "\t\\\y\"\u"
> EOF
> fatal: bad config line 2 in standard input
>
> But in subsection names, the backslash is simply dropped if the
> following character does not
tbo...@web.de writes:
>
> Reviewed-by: Johannes Schindelin
> Signed-off-by: Torsten Bögershausen
I'll flip these and add a helped-by to credit Eric.
check-non-portable-shell.pl: `wc -l` may have leading WS
Test scripts count number of lines in an output and check it againt
its
Ævar Arnfjörð Bjarmason writes:
> Those options could also support combining with -m, but given what
> they do I can't think of a good use-case for doing that, so I have not
> made the more invasive change of splitting up the logic in commit.c to
> first act on those, and then on -m options.
>
>
Junio C Hamano writes:
> ... So "nobody immediately thought of it when it was added" is
> certainly not a reason to later make the combination possible.
Oops, not a reason to later "_not_ to" make an update, of course.
"phillip.w...@talktalk.net" writes:
>>Original Message
>>From: johannes.schinde...@gmx.de
>>Date: 22/12/2017 11:50
>>To:
>>Cc: "Junio C Hamano", "Phillip Wood" w...@dunelm.org.uk>, "Kaartic Sivaraam"
>>Subj: [PATCH] sequencer: assign only free()able strings to gpg_sign
>>
>>The gpg_sign
Julien Dusser writes:
> Git credential fails with special char in password.
> remote: Invalid username or password.
> fatal: Authentication failed for
>
> File ~/.git-credential contains badly urlencoded characters
> %ffXX%ffYY instead of %XX%YY.
>
> Add a cast to an unsigned char to fix
On Fri, Dec 22 2017, Junio C. Hamano jotted:
> Ævar Arnfjörð Bjarmason writes:
>
>> Those options could also support combining with -m, but given what
>> they do I can't think of a good use-case for doing that, so I have not
>> made the more invasive change of splitting up the logic in commit.c
Ævar Arnfjörð Bjarmason writes:
> I don't agree that git as a tool should be so opinionated. You can edit
> these --fixup messages right now with --edit, and I do. That it doesn't
> work with -m"" as it should is a longstanding UI wart.
I think you missed the point.
I was expressing my opinion,
On Fri, Dec 22, 2017 at 7:57 AM, Cristian Achim wrote:
>> Can you show the output of "git remote"
>
> # in usb_subfolder
> $git remote
> origin
> $
>
> #in home_subfolder
> $git remote
> $
>
With the -v switch you can see where each remote points to (tho your
home local repo has no remote which i
Stefan Beller writes:
> On Tue, Dec 19, 2017 at 11:22 AM, Junio C Hamano wrote:
>> I had to squash in the following to make 'pu' pass under
>> gettext-poison build. Is this ready for 'next' otherwise?
>
> I saw that in pu, thanks for squashing. I should have spoken
> up earlier confirming it.
Ensure that an oidmap is initialized before attempting to add, remove,
or retrieve an entry by simply performing the initialization step
before accessing the underlying hashmap.
Signed-off-by: Brandon Williams
---
oidmap.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/oidmap.c
Thank you for review. I didn't find any other error.
Code in http.c:quote_ref_url() is almost the same but ch is a signed
int, so there's no issue.
Le 22/12/2017 à 22:48, Junio C Hamano a écrit :
Julien Dusser writes:
Git credential fails with special char in password.
remote: Invalid usern
While working on patches to teach `git rebase -i` to recreate branch topology
properly, i.e. replace the design of `--preserve-merges` by something much
better, I stumbled across a couple of issues that I thought I should fix on the
way.
The patches are based on lb/rebase-i-short-command-names, ma
This is a *really* long-standing bug. As a matter of fact, this bug has
been with us from the very beginning of `rebase -i`: 1b1dce4bae7 (Teach
rebase an interactive mode, 2007-06-25), where the output of `rev-list`
was piped to `sed` (and any failure of the `rev-list` process would go
completely u
In a conditional block that is only reached when handling a TODO_REWORD
(as seen even from a 3-line context), there is absolutely no need to
nest another block under the identical condition.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(
The noop command cannot accept any argument, but we never told the user
about any bogus argument. Fix that.
while at it, mention clearly when an argument is required but missing
(for commands *other* than noop).
Signed-off-by: Johannes Schindelin
---
sequencer.c | 13 +
1 file chang
Signed-off-by: Johannes Schindelin
---
sequencer.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 115085d39ca..8e6b6289be6 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -491,7 +491,7 @@ static int is_index_unchanged(void)
struct
For commands that do not have an argument, there is no need to append a
trailing space at the end of the line.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 5632415ea2d..970842e3fcc 10064
Hi Junio,
On Fri, 22 Dec 2017, Junio C Hamano wrote:
> Brandon Williams writes:
>
> >> -#define OIDMAP_INIT { { NULL } }
> >> +/*
> >> + * This macro initializes the data structure only incompletely, just
> >> enough
> >> + * to call oidmap_get() on an empty map. Use oidmap_init() instead.
> >
Hi Brandon,
On Fri, 22 Dec 2017, Brandon Williams wrote:
> Ensure that an oidmap is initialized before attempting to add, remove,
> or retrieve an entry by simply performing the initialization step
> before accessing the underlying hashmap.
>
> Signed-off-by: Brandon Williams
> ---
> oidmap.c
Hi Julien,
On Sat, 23 Dec 2017, Julien Dusser wrote:
> Thank you for review. I didn't find any other error.
> Code in http.c:quote_ref_url() is almost the same but ch is a signed int, so
> there's no issue.
But that ch comes from a signed char *, so it actually *is* an issue: if
you cast a signe
On Fri, Dec 22, 2017 at 12:46 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote:
>>> index_has_changes() is a function we want to reuse outside of just am,
>>> making it also available for merge-recursive and merge-ort.
>>>
>>> Signed-of
Hi Jacob,
On Sat, Dec 23, 2017 at 12:05 AM, Jacob Keller wrote:
> If you wish to update it later, you can mount hte usb stick, and then
> just run git pull from inside the new subfolder. Note that you do
> *not* run "git pull home_subfolder", as git pull expects the name of a
> remote, which in t
The big contention among git users is whether to rebase or to merge
changes [2][3] while iterating. I used to firmly believe that merging
was the way to go and rebase was harmful. More recently, I have worked
in some environments where I saw rebase used very effectively while
iterating on changes a
On Fri, Dec 22, 2017 at 01:07:59PM -0800, Junio C Hamano wrote:
> tbo...@web.de writes:
>
> >
> > Reviewed-by: Johannes Schindelin
> > Signed-off-by: Torsten Bögershausen
>
> I'll flip these and add a helped-by to credit Eric.
...
> Don't try to apply this patch to your tree yourself ;-)
Than
60 matches
Mail list logo
