Dear Philip and Christian,
Here my answers:
1) We have a repository that we got from another person in another
city.We use the same CENTOS_6 . We put the repository on Windows
machine, on which we can access remotely and mounted the directory on
CENTOS_6, that we use by the WMVare Player (basica
The last argument of reencode_string_len() is an 'int *' which is
assigned the length of the converted string. When NO_ICONV is defined,
however, reencode_string_len() is stubbed out by the macro:
#define reencode_string_len(a,b,c,d,e) NULL
which never assigns a value to the final argument. W
On Fri, Jun 5, 2015 at 1:26 AM, Junio C Hamano wrote:
> Paul Tan writes:
>
>> git-am generally supports applying patches to unborn branches.
>> However, there are 2 cases where git-am does not handle unborn
>> branches which I would like to address before the git-am rewrite to C:
>
>> 1. am --ski
Thanks, thanks, thanks.
One last question. If I don't want to compile Git myself, how long may the pu
branch take approx. to get into a next release?
Mit freundlichen Grüßen
Andreas Gondek
Applications
Deutsche WertpapierService Bank AG
ITTAS
Derendorfer Allee
There was discussion sometime back about the object_id conversions and
handling direct offsets in pack files. In some places in sha1_file.c,
we return direct pointers to the SHA-1 values in the mmap'd pack file
and use those in other parts of the code.
However, with the object_id conversion, we r
On Thu, Jun 4, 2015 at 8:38 PM, Allen Hubbe wrote:
> On Thu, Jun 4, 2015 at 6:53 PM, Remi Lespinet
> wrote:
>> On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
>> wrote:
>>>
>>> Hi,
>>>
>>> Working on git-send-email, I've seen that there's no aliases support
>>> when manually adding a recipient in
I'm writing about the patch that Jeff King submitted on April 22, in
<20150422193101.gc27...@peff.net>, in particular,
https://github.com/git/git/commit/ed178ef13a26136d86ff4e33bb7b1afb5033f908
. It appears that this patch was included in git 2.4.2, and it breaks my
workflow.
In particular, I
On Thu, Jun 4, 2015 at 6:53 PM, Remi Lespinet
wrote:
> On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
> wrote:
>>
>> Hi,
>>
>> Working on git-send-email, I've seen that there's no aliases support
>> when manually adding a recipient in a 'To' or 'Cc' field in a patch
>> and for the --to-cmd and --c
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet
---
Only one change compared to previous version:
Initialization for the threeway variable was missing. This caused
a behavior change for command lines like:
threeway=t git am ...
This commit adds initialization for this variable.
Signed-off-by: Remi Lespinet
---
git-am.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-am.sh
Create a setup for git am -3 in a separate test instead of creating
this setup each time.
This prepares for the next commit which will use this setup as well.
Signed-off-by: Remi Lespinet
---
t/t4150-am.sh | 32 ++--
1 file changed, 14 insertions(+), 18 deletions(-)
(Seen in git versions: 2.1.0 and 1.9.3 et al.)
$ git format-patch --stdout X^..X | git apply check -
fatal: unrecognized input
This fails when the commit consists of nothing but a submodule change
(as in 'git add submodule foo'), but it passes when a file change is
added to the same commit.
Ther
On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
wrote:
>
> Hi,
>
> Working on git-send-email, I've seen that there's no aliases support
> when manually adding a recipient in a 'To' or 'Cc' field in a patch
> and for the --to-cmd and --cc-cmd.
>
> I would like to add this support, and I wonder if the
Junio C Hamano writes:
> "Gondek, Andreas" writes:
>
>> thank you for responding this fast. I would suggest providing this
>> information as an additional parameter (like %A %O %B and %L) maybe
>> %P.
>
> Yes, per-cent plus a letter is more in line with the way information
> is passed to the scr
> On Thu, Jun 4, 2015 at 5:11 PM, Stefan Beller wrote:
> > On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
> > wrote:
> >> Working on git-send-email, I've seen that there's no aliases support
> >> when manually adding a recipient in a 'To' or 'Cc' field in a patch
> >> and for the --to-cmd and --cc
Tay Ray Chuan writes:
> It may not be obvious from its name that wt_status_print_updated() that
> it also sets wt_status.commitable, which affects commit functionality.
> Extract this out into a separate function for improved clarity, though
> at the expense of executing another loop.
Makes sens
On Thu, Jun 4, 2015 at 5:11 PM, Stefan Beller wrote:
> On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
> wrote:
>> Working on git-send-email, I've seen that there's no aliases support
>> when manually adding a recipient in a 'To' or 'Cc' field in a patch
>> and for the --to-cmd and --cc-cmd.
>>
>>
On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET
wrote:
>
> Hi,
>
> Working on git-send-email, I've seen that there's no aliases support
> when manually adding a recipient in a 'To' or 'Cc' field in a patch
> and for the --to-cmd and --cc-cmd.
>
> I would like to add this support, and I wonder if the
Hi,
Working on git-send-email, I've seen that there's no aliases support
when manually adding a recipient in a 'To' or 'Cc' field in a patch
and for the --to-cmd and --cc-cmd.
I would like to add this support, and I wonder if there are reasons
not to do it.
Thanks.
--
To unsubscribe from this l
On 2015-06-04 13.00, Ed Avis wrote:
>
> >Updates files in the working tree to match...
I think that this had been written with
"git checkout " in mind, which is different
from "git checkout -- " (or "git checkout .")
Do you think you can write a patch to improve the documentation ?
--
To
From: "Christian Couder"
Hi,
On Thu, Jun 4, 2015 at 3:04 PM, Rossella Barletta
wrote:
Dear git group,
I would like to ask your help for a problem that we cannot fix in any
way.
We have a git repository in folder on Windows.
Then we use VMware player on CentOS_6 on which we create a clon
Hi,
On Thu, Jun 4, 2015 at 3:04 PM, Rossella Barletta
wrote:
> Dear git group,
>
>
> I would like to ask your help for a problem that we cannot fix in any way.
>
> We have a git repository in folder on Windows.
>
> Then we use VMware player on CentOS_6 on which we create a clone of
> the git repo
Tay Ray Chuan writes:
> When running git-commit`, --verbose appends a diff to the prepared
> message, while --no-status omits git-status output.
The --verbose option is called --verbose and not --diff or --patch
for a reason, though. The default is to show extra information as
comments, and ver
Antoine Delaite writes:
> From: Christian Couder
>
> When not looking for a regression during a bisect but for a fix or a
> change in another given property, it can be confusing to use 'good'
> and 'bad'.
>
> This patch introduce `git bisect new` and `git bisect old` as an
> alternative to 'bad'
When running git-commit`, --verbose appends a diff to the prepared
message, while --no-status omits git-status output; thus, one would
expect --verbose --no-status to give a commit message with a diff of
the commit without git-status output.
However, this is not what happens - the prepared commit
When running git-commit`, --verbose appends a diff to the prepared
message, while --no-status omits git-status output; thus, one would
expect --verbose --no-status to give a commit message with a diff of
the commit without git-status output.
However, this is not what happens - the prepared commit
It may not be obvious from its name that wt_status_print_updated() that
it also sets wt_status.commitable, which affects commit functionality.
Extract this out into a separate function for improved clarity, though
at the expense of executing another loop.
Signed-off-by: Tay Ray Chuan
---
Changed
Jeff King writes:
> On top of nd/slim-index-pack-memory-usage, which introduced the bug (but
> it is already in master).
Thanks.
In this round, I decided to deliberately merge more iffy and larger
topics to 'master' in early part of the cycle, and it seems to be
paying off nicely ;-).
Will que
On Thu, Jun 4, 2015 at 3:34 AM, Paul Tan wrote:
> Hi,
>
> git-am generally supports applying patches to unborn branches.
> However, there are 2 cases where git-am does not handle unborn
> branches which I would like to address before the git-am rewrite to C:
>
> 1. am --skip
>
> For git am --skip,
Paul Tan writes:
> git-am generally supports applying patches to unborn branches.
> However, there are 2 cases where git-am does not handle unborn
> branches which I would like to address before the git-am rewrite to C:
> 1. am --skip
>
> For git am --skip, git-am.sh does a fast-forward checkout
Matthieu Moy writes:
>> +void get_two_last_lines(char *filename, int *numlines, char **lines)
>> +{
>> +...
>> +}
>> +
>> +void get_two_first_lines(char *filename, int *numlines, char **lines)
>> +{
>> +...
>> +}
I had a handful of comments on these:
- Do we need two separate and overly specif
Will Palmer writes:
> What I'm thinking now is that "@^{/foo}" can be thought of as a
> potential "shorthand-form" of what could be "@^{/!(m=foo)}", in which
> case "@^{/!-foo}" could similarly be thought of as a potential
> shorthand-form of what could be "@^{/!(m-foo)}".
Ah, our messages cross
Jeff King writes:
> We should definitely _not_ add anything that scales with the repository
> size. For instance, the "symref" field only shows the "HEAD" now. That's
> OK, as it's constant size.
I agree that this is an easy-to-explain rule to keep the design
sensible.
> We do not show _all_ sy
On Thu, Jun 4, 2015 at 6:09 AM, Jeff King wrote:
> On Mon, Jun 01, 2015 at 10:49:45AM -0700, Stefan Beller wrote:
>
>> However the client side with builtin/fetch, builtin/fetch-pack, fetch-pack
>> is a bit of a mystery to me, as I cannot fully grasp the difference between
>> * connect.{h,c}
>> *
On Thu, Jun 4, 2015 at 4:42 AM, Michael Haggerty wrote:
> On 06/04/2015 10:40 AM, Johannes Sixt wrote:
> We *certainly* don't require high-quality random numbers for this
> application. Regarding portability, there is one definite point in favor
> of rand() (it's available on Windows) vs. Junio's
Remi Lespinet writes:
> @@ -90,10 +90,13 @@ default. You can use `--no-utf8` to override this.
>
> -3::
> --3way::
> +--no-3way::
> When the patch does not apply cleanly, fall back on
> 3-way merge if the patch records the identity of blobs
> it is supposed to apply to and
Initialization for the threeway variable was missing. This caused
a behavior change for command lines like:
threeway=t git am ...
This commit adds initialization for this variable.
Signed-off-by: Remi Lespinet
---
git-am.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-am.sh
Create a setup for git am -3 in a separate test instead of creating
this setup each time.
This prepares for the next commit which will use this setup as well.
Signed-off-by: Remi Lespinet
---
t/t4150-am.sh | 32 ++--
1 file changed, 14 insertions(+), 18 deletions(-)
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet
---
Documentation/config.txt | 8
Documen
Hello, is there anywhere on the web that displays git's latest security alerts
Sent from iPhone--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
> Matthieu Moy writes
> > > +CONFIGURATION
> > > +-
> > > +
> > > +am.keepcr::
> > > +If true, git-am will call git-mailsplit for patches in mbox
> > > format
> >
> > `git am`
> > `git mailsplit`
> >
> > > +with parameter '--keep-cr'. In this case git-mailsplit will
>
On Mon, Jun 01, 2015 at 04:40:54PM -0700, Stefan Beller wrote:
> Thinking about this further, maybe it is a good idea to restrict the
> capabilities advertising to alphabetical order?
This seems like an unnecessary restriction. The main impetus seems to
be:
> So how does parse_capability scale w
On Thu, Jun 4, 2015 at 7:35 PM, Jeff King wrote:
> Commit c6458e6 (index-pack: kill union delta_base to save
> memory, 2015-04-18) refactored the comparison functions used
> in sorting and binary searching our delta list. The
> resulting code does something like:
>
> int cmp_offsets(off_t a, off
On Mon, Jun 01, 2015 at 10:49:45AM -0700, Stefan Beller wrote:
> However the client side with builtin/fetch, builtin/fetch-pack, fetch-pack
> is a bit of a mystery to me, as I cannot fully grasp the difference between
> * connect.{h,c}
> * remote.{h.c}
> * transport.{h.c}
> there. All of it see
Dear git group,
I would like to ask your help for a problem that we cannot fix in any way.
We have a git repository in folder on Windows.
Then we use VMware player on CentOS_6 on which we create a clone of
the git repository, after of course having mounted the directory in
which the repository
Commit c6458e6 (index-pack: kill union delta_base to save
memory, 2015-04-18) refactored the comparison functions used
in sorting and binary searching our delta list. The
resulting code does something like:
int cmp_offsets(off_t a, off_t b)
{
return a - b;
}
This works most of the
On Thu, May 28, 2015 at 3:03 AM, Torsten Bögershausen wrote:
> On 2015-05-27 15.33, Paul Tan wrote:
>> +/**
>> + * xopen() is the same as open(), but it die()s if the open() fails.
>> + */
>> +int xopen(const char *path, int flags, mode_t mode)
>> +{
>> + int fd;
>> +
>> + assert(path);
>>
On 06/04/2015 10:40 AM, Johannes Sixt wrote:
> Am 30.05.2015 um 19:12 schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>
>>> There you have it: Look the other way for a while, and people start
>>> using exotic stuff... ;)
>>
>> Is it exotic to have random/srandom? Both are in POSIX and 4BSD;
>>
Ed Avis waniasset.com> writes:
>Julio H. asked how I had learned to run 'git checkout .'.
Sorry it was Torsten B. who asked that. But yes, I think it was just word
of mouth.
--
Ed Avis
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vg
Kevin Daudt ikke.info> writes:
>If people execute git checkout . as a habbit
>without thinking, they will soon train to do git checkout -f . without
>thinking, and then you still have the same problem.
I don't quite agree; you only learn to use the -f flag if the plain command
doesn't do what yo
Stefan Beller google.com> writes:
>So in one mode, we do actually warn about contents going missing, and the
>other mode is designed to actually make things go missing without any
>warning.
I think this is a big part of the issue. Two rather different operations
are given the name 'checkout', a
Hi,
git-am generally supports applying patches to unborn branches.
However, there are 2 cases where git-am does not handle unborn
branches which I would like to address before the git-am rewrite to C:
1. am --skip
For git am --skip, git-am.sh does a fast-forward checkout from HEAD to
HEAD, disca
On Wed, Jun 3, 2015 at 5:29 PM, Junio C Hamano wrote:
[snip]
> [Footnote]
>
> *1* In the context of this discussion, after screwing up the change
> in hello.c, instead of expressing the wish to recover and to
> start from scratch in two separate commands, i.e.
>
> rm hello.c && upd
On Thu, Jun 04, 2015 at 09:31:04AM +0200, Stefan Näwe wrote:
> > + if (!rev->pending.nr && !opt->def)
> > + die("you do not have a commit yet on your branch");
>
> I am not a native english speaker but shouldn't this be:
>
> "you do not have a commit on your branch yet"
Both are f
Am 30.05.2015 um 19:12 schrieb Junio C Hamano:
Johannes Sixt writes:
There you have it: Look the other way for a while, and people start
using exotic stuff... ;)
Is it exotic to have random/srandom? Both are in POSIX and 4BSD;
admittedly rand/srand are written down in C89 and later, so they
On Wed, Jun 03, 2015 at 10:24:02AM -0700, Junio C Hamano wrote:
> Which is what led me to say "Why are we defaulting to HEAD before
> checking if it even exists? Isn't that the root cause of this
> confusion? What happens if we stopped doing it?"
>
> And I think the "diagnose after finding that
On Thu, Jun 4, 2015 at 9:59 AM, Antoine Delaite
wrote:
> From: Christian Couder
>
> When not looking for a regression during a bisect but for a fix or a
> change in another given property, it can be confusing to use 'good'
> and 'bad'.
>
> This patch introduce `git bisect new` and `git bisect old
On Wed, Jun 03, 2015 at 05:39:14PM +0200, Dennis Kaarsemaker wrote:
> On di, 2015-06-02 at 23:48 -0700, Junio C Hamano wrote:
> >
> > I am kind of surprised after reading these two threads that my
> > take on this issue has changed over time, as my knee-jerk
> > reaction before reading them was t
Antoine Delaite writes:
> @@ -732,18 +736,25 @@ static void handle_bad_merge_base(void)
> if (is_expected_rev(current_bad_oid)) {
> char *bad_hex = oid_to_hex(current_bad_oid);
> char *good_hex = join_sha1_array_hex(&good_revs, ' ');
> -
> - fprintf(s
I'd swap 3/4 and 4/4 so that we see the impact of your code on these new
tests. I won't insist on that though.
Please help reviewers by explaining in the commit message why these
tests are needed (what was not covered properly by existing tests?)
Guillaume Pagès writes:
> +test_expect_success '
Guillaume Pagès writes:
> + (use git rebase --edit-todo to view and edit)
You're still missing double-quotes around "git rebase --edit-todo".
Guillaume Pagès writes:
> +Last command(s) done (1 command(s) done):
Can't we just have "1 command"/"2 commands" instead of this (s). It's
particular
From: Christian Couder
Signed-off-by: Antoine Delaite
---
bisect.c | 35 +--
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/bisect.c b/bisect.c
index d6c19fd..68417bb 100644
--- a/bisect.c
+++ b/bisect.c
@@ -21,8 +21,8 @@ static const char *argv_
From: Christian Couder
When not looking for a regression during a bisect but for a fix or a
change in another given property, it can be confusing to use 'good'
and 'bad'.
This patch introduce `git bisect new` and `git bisect old` as an
alternative to 'bad' and good': the commits which have the m
From: Christian Couder
Signed-off-by: Antoine Delaite
---
bisect.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bisect.c b/bisect.c
index 68417bb..87a5f6d 100644
--- a/bisect.c
+++ b/bisect.c
@@ -915,10 +915,10 @@ void read_bisect_terms(void)
name_
On 06/04/2015 02:38 AM, Jeff King wrote:
On Wed, Jun 03, 2015 at 06:08:50PM +0200, Matthieu Moy wrote:
> Karthik Nayak writes:
>
>> Matthieu Moy suggested that I work on the unification of these
>> commands let both the implementations stay where the user can select
>> the implementation to be
Am 03.06.2015 um 19:24 schrieb Junio C Hamano:
> Jeff King writes:
>
>> My concern there would be risk of regression. I.e., that we would take
>> some case which used to error out and turn it into a silent noop. So I'd
>> prefer to keep the behavior the same, and just modify the error code
>> pat
66 matches
Mail list logo
