Hi,
I have just realize, that my attachment has been cut off from my previous
message.
Below you can find patch with requested change.
Add support for user defined suffix part of name of temporary files
created by git mergetool
---
Documentation/git-mergetool.txt | 26 -
gi
On Tue, Oct 4, 2016 at 11:15 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> We don't use it internally _yet_. I need to go through all the
>> external diff code and see --shift-ita should be there. The end goal
>> is still changing the default behavior and getting rid of --shift-ita,
>
> I d
On Tue, Oct 04, 2016 at 01:18:47AM -0400, Josef Ridky wrote:
> Hi Anatoly,
>
>
> | Sent: Monday, October 3, 2016 5:18:44 PM
> |
> | Hi Josef,
> |
> |
> | On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
> | > In several projects, we are using git mergetool for comparing files from
> | > dif
[git@vger.kernel.org does not accept HTML emails]
I just hope that this email don't get mangled too much...
On 5 October 2016 at 04:55, Santiago Perez De Rosso
wrote:
> On Fri, Sep 30, 2016 at 6:25 PM Jakub Narębski wrote:
>> W dniu 30.09.2016 o 18:14, Konstantin Khomoutov pisze:
>>
>>> The "It
Hi David,
thank you very much for your reply.
Today I realized, that my attachment has been cut off, so I sent it in the
morning [1].
I believe, that most of answer can be find in my previous email from this
morning.
Only change, that should be done by this request is add possibility to edit
h
On Fri, Sep 09, 2016 at 05:54:30PM +0700, Duy Nguyen wrote:
> On Tue, Sep 6, 2016 at 4:08 AM, Christian Neukirchen
> wrote:
> > Hi,
> >
> > I noticed the following suprising behavior:
> >
> > % git --version
> > git version 2.10.0
> >
> > % git add bar
> > % git status -s
> > A bar
> > M foo
> >
Hi James,
On Wed, 5 Oct 2016, James B wrote:
> On Tue, 4 Oct 2016 18:08:33 +0200 (CEST)
> Johannes Schindelin wrote:
>
> > No, it is not. You quote POSIX, but the matter of the fact is that we
> > use a subset of POSIX in order to be able to keep things running on
> > Windows.
> >
> > And quit
On Wed, Oct 5, 2016 at 5:14 PM, Jakub Narębski wrote:
> [git@vger.kernel.org does not accept HTML emails]
>
> I just hope that this email don't get mangled too much...
>
> On 5 October 2016 at 04:55, Santiago Perez De Rosso
> wrote:
>> On Fri, Sep 30, 2016 at 6:25 PM Jakub Narębski wrote:
>>> W
Hi writeonce,
On Tue, 4 Oct 2016, writeo...@midipix.org wrote:
> < On Tue, 4 Oct 2016, Rich Felker wrote:
> <
> < > On Tue, Oct 04, 2016 at 11:27:22AM -0400, Jeff King wrote:
> < > > On Tue, Oct 04, 2016 at 11:08:48AM -0400, Rich Felker wrote:
> < > >
> < > > > 1. is nonzero mod page size, it j
Hi Rich,
On Tue, 4 Oct 2016, Rich Felker wrote:
> On Tue, Oct 04, 2016 at 06:08:33PM +0200, Johannes Schindelin wrote:
>
> > And lastly, the best alternative would be to teach musl about
> > REG_STARTEND, as it is rather useful a feature.
>
> Maybe, but it seems fundamentally costly to support -
Hi Junio,
On Tue, 4 Oct 2016, Junio C Hamano wrote:
> I'd tweak the message while queuing, though.
>
> wt-status: make the require_clean_work_tree() function reusable
>
> The function "git pull" uses to stop the user when the working
> tree has changes is useful in other places.
Hi Junio,
On Tue, 4 Oct 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > This is the 5th last patch series of my work to accelerate interactive
> > rebases in particular on Windows.
>
> Offtopic, but I am always confused by what you might mean by this
> "nth last patch series".
Duy Nguyen writes:
>> At the least I think we should clarify this in the document.
>
> How about something like this? Would it help?
I think it captures the current behavior well.
--
Christian Neukirchenhttp://chneukirchen.org
Hi Junio,
On Mon, 12 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves
> > like a one-shot command when it reads its configuration: memory is
> > allocated and released only when the command exits.
> >
> > Thi
Hi Junio,
On Mon, 12 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > +static const char *get_dir(const struct replay_opts *opts)
> > +{
> > + return git_path_seq_dir();
> > +}
>
> Presumably this is what "In a couple of commits" meant, i.e. opts
> will be used soonish.
E
On Wed, 5 Oct 2016 12:41:50 +0200 (CEST)
Johannes Schindelin wrote:
> >
> > Wow, I don't know that Windows is a git's first-tier platform now,
>
> It is. Git for Windows is maintained by me, and I make as certain as I can
> that it works fine.
> And yes, we have download numbers to support my
Hi Junio,
On Mon, 12 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The return value of do_recursive_merge() may be positive (indicating merge
> > conflicts), so let's OR later error conditions so as not to overwrite them
> > with 0.
>
> Are the untold assumptions as follo
Hi Junio,
On Mon, 12 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > This teaches the sequencer_commit() function to take an argument that
> > will allow us to implement "todo" commands that need to amend the commit
> > messages ("fixup", "squash" and "reword").
> >
> > Sign
* Johannes Schindelin [2016-10-05 13:17:49 +0200]:
> I had a brief look at the source code (you use backtracking... hopefully
> nobody uses musl to parse regular expressions from untrusted, or
> inexperienced, sources [*1*]), and it seems that the regex code might
does git use BRE?
a conforming
Hi Junio & Hannes,
On Thu, 15 Sep 2016, Junio C Hamano wrote:
> Johannes Sixt writes:
>
> > Am 11.09.2016 um 12:55 schrieb Johannes Schindelin:
> >> -static int write_message(struct strbuf *msgbuf, const char *filename)
> >> +static int write_with_lock_file(const char *filename,
> >> +
W dniu 05.10.2016 o 00:33, Rich Felker pisze:
> On Wed, Oct 05, 2016 at 09:06:25AM +1100, James B wrote:
>> On Tue, 4 Oct 2016 18:08:33 +0200 (CEST)
>> Johannes Schindelin wrote:
>>>
>>> No, it is not. You quote POSIX, but the matter of the fact is that we use
>>> a subset of POSIX in order to be
On Wed, Oct 05, 2016 at 01:17:49PM +0200, Johannes Schindelin wrote:
> Hi Rich,
>
> On Tue, 4 Oct 2016, Rich Felker wrote:
>
> > On Tue, Oct 04, 2016 at 06:08:33PM +0200, Johannes Schindelin wrote:
> >
> > > And lastly, the best alternative would be to teach musl about
> > > REG_STARTEND, as it i
On Tue, Oct 04, 2016 at 02:03:58PM -0700, Stefan Beller wrote:
> Jeff,
> thanks for the suggestions, both git_path(..) as well as checking the config,
> this seems quite readable to me:
When reading the discussion I thought the same: What about the
"old-style" repositories. I like this one. Checki
Hi,
please do not top-post the conversation will otherwise get hard to
follow. Thank you.
On Tue, Oct 04, 2016 at 05:46:45PM +0200, Thomas Bétous wrote:
> Thank you for your answer and sorry for the delay (I was on vacation...).
>
> I am using git 2.9.0.windows.1 (run on Windows 7 via git bash).
W dniu 04.10.2016 o 22:58, Stefan Beller pisze:
> On Tue, Oct 4, 2016 at 1:55 PM, Jeff King wrote:
>> On Tue, Oct 04, 2016 at 01:52:19PM -0700, Jacob Keller wrote:
>>
+# Note: These tests depend on the hard-coded value of 5 as "too
deep". We start
+# the depth at 0 and
On Tue, Oct 04, 2016 at 12:01:13PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Stefan Beller writes:
> >
> >> I wonder if we could make that convenient for users by not tracking
> >> the submodule,
> >> i.e.
> >> * we have the information in the .gitmodules file
> >> * the path i
W dniu 03.10.2016 o 22:36, Jeff King pisze:
> +test_expect_success 'count-objects shows the alternates' '
> + cat >expect <<-EOF &&
> + alternate: $(pwd)/B/.git/objects
> + alternate: $(pwd)/A/.git/objects
> + EOF
> + git -C C count-objects -v >actual &&
> + grep ^alternate
When we are copying the alternates from the source
repository, if we find a relative path that is too deep for
the source (e.g., "../../../objects" from "/repo.git/objects"),
then normalize_path_copy will report an error and leave
trash in the buffer, which we will add to our new alternates
file. I
From: Sergey Organov
Signed-off-by: Sergey Organov
---
Documentation/git-merge.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 90342eb..216d2f4 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/gi
From: Sergey Organov
Old description had a few problems:
- sounded as if commits have changes
- stated that changes are taken since some "divergence point"
that was not defined.
New description rather uses "common ancestor" and "merge base",
definitions of which are easily discoverable in th
From: Sergey Organov
No awareness of git-pull is required to understand git-merge operation,
so leave reference to git-pull only where it actually makes sense, in
the description of fast-forward merges, and only as clarification of
when this merging behaviour is mostly useful.
Other references t
From: Sergey Organov
"-m " is one of essential distinctions between obsolete
invocation form and the recent one. Add it to the "usage" returned by
'git merge -h' for more clarity.
Signed-off-by: Sergey Organov
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --gi
From: Sergey Organov
Old description not only raised the question of why the tool is called
git-merge rather than git-join, but "join histories" also sounds like
very simple operation, something like what "git-merge -s ours" does.
Signed-off-by: Sergey Organov
---
Documentation/git-merge.txt |
From: Sergey Organov
Sergey Organov (6):
git-merge: clarify "usage" by adding "-m "
Documentation/git-merge.txt: remove list of options from SYNOPSIS
Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include
options
Documentation/git-merge.txt: improve short description in
From: Sergey Organov
This partial list of option is confusing as it lacks a lot of
available options. It also clutters the SYNOPSIS making differences
between forms of invocation less clear.
Signed-off-by: Sergey Organov
---
Documentation/git-merge.txt | 5 +
1 file changed, 1 insertion(+)
On Wed, Oct 05, 2016 at 03:58:53PM +0200, Jakub Narębski wrote:
> I would prefer the following:
>
> # A --> B --> C --> D --> E --> F --> G --> H
> # 0 1 2 3 4 5 6
Yeah, that is also more visually pleasing.
Here's a squashable update that uses that and clarifies t
On Tue, Oct 04, 2016 at 02:03:58PM -0700, Stefan Beller wrote:
> thanks for the suggestions, both git_path(..) as well as checking the config,
> this seems quite readable to me:
>
> builtin/push.c | 14 +-
> 1 file changed, 13 insertions(+), 1 deletion(-)
Yeah, this seems like a goo
On Wed, Oct 5, 2016 at 8:47 AM, Jeff King wrote:
> On Tue, Oct 04, 2016 at 02:03:58PM -0700, Stefan Beller wrote:
>
>> thanks for the suggestions, both git_path(..) as well as checking the config,
>> this seems quite readable to me:
>>
>> builtin/push.c | 14 +-
>> 1 file changed, 13
Josef Ridky writes:
> Hi,
>
> I have just realize, that my attachment has been cut off from my previous
> message.
> Below you can find patch with requested change.
>
> Add support for user defined suffix part of name of temporary files
> created by git mergetool
> ---
The first two paragraphs
On Wed, Oct 05, 2016 at 10:59:34PM +1100, James B wrote:
> Number downloads does not make first-tier platform. You know that as
> well as everyone else.
>
> First-tier support is the decision made by the maintainers that the
> entire features of the software must be available on those first tier
Heiko Voigt writes:
>> It IS a hack, but having this information in .git would
>> mean that it can be forced to be in machine readable form, unlike a
>> mention in README. I do not know if the .gitmodules/.gitignore
>> combination is a sensible thing to use, but it does smell like a
>> potential
Jeff King writes:
> On Wed, Oct 05, 2016 at 03:58:53PM +0200, Jakub Narębski wrote:
>
>> I would prefer the following:
>>
>> # A --> B --> C --> D --> E --> F --> G --> H
>> # 0 1 2 3 4 5 6
>
> Yeah, that is also more visually pleasing.
>
> Here's a squashable upda
On 04/10/2016 23:31, René Scharfe wrote:
So let's summarize; here's the effect of a raw qsort(3) call:
array == NULL nmemb bug QSORT following NULL check
- - --- -
0 0 no qsort is skipped
0 >0 no qsort is
On Wed, Oct 05, 2016 at 03:11:05PM +0200, Jakub Narębski wrote:
> W dniu 05.10.2016 o 00:33, Rich Felker pisze:
> > On Wed, Oct 05, 2016 at 09:06:25AM +1100, James B wrote:
> >> On Tue, 4 Oct 2016 18:08:33 +0200 (CEST)
> >> Johannes Schindelin wrote:
> >>>
> >>> No, it is not. You quote POSIX, but
Hello,
I want to deploy a hook script to control format of commit message. For this I
use the prepare-commit-msg script.
I want to check if the commit message starts with a number of 3 digits. If this
is the case, the script returns 0, otherwise 1.
It works fine for an utilisation with the git
Johannes Schindelin writes:
>> The function "git pull" uses to stop the user when the working
>> tree has changes is useful in other places.
>
> I stumbled over this sentence. How about
>
> The function used by "git pull" to stop [...]
>
> instead?
Perfect. Thanks.
On Wed, Oct 05, 2016 at 12:11:58PM -0400, Jeff King wrote:
> On Wed, Oct 05, 2016 at 10:59:34PM +1100, James B wrote:
>
> > Number downloads does not make first-tier platform. You know that as
> > well as everyone else.
> >
> > First-tier support is the decision made by the maintainers that the
>
Hi Johannes,
>
>
> Original Message
> Subject: RE: [musl] Re: Regression: git no longer works with musl libc's
> regex impl
> From: Johannes Schindelin
> Date: Wed, October 05, 2016 3:49 am
> To: writeo...@midipix.org
> Cc: m...@lists.openwall.com, git@vger.kernel.org, Jeff Ki
On Wed, Oct 5, 2016 at 7:40 AM, Jeff King wrote:
> On Wed, Oct 05, 2016 at 03:58:53PM +0200, Jakub Narębski wrote:
>
>> I would prefer the following:
>>
>> # A --> B --> C --> D --> E --> F --> G --> H
>> # 0 1 2 3 4 5 6
>
> Yeah, that is also more visually pleasing.
On Wed, Oct 5, 2016 at 7:29 AM, Jeff King wrote:
> When we are copying the alternates from the source
> repository, if we find a relative path that is too deep for
> the source (e.g., "../../../objects" from "/repo.git/objects"),
> then normalize_path_copy will report an error and leave
> trash in
W dniu 05.10.2016 o 16:46, sorga...@gmail.com pisze:
> From: Sergey Organov
>
> Old description had a few problems:
>
> - sounded as if commits have changes
>
> - stated that changes are taken since some "divergence point"
> that was not defined.
>
> New description rather uses "common ances
Stefan Beller writes:
> I thought about that, but as I concluded that the get_all_attrs doesn't need
> conversion to a threading environment, we can keep it as is.
I agree that it is OK for get_all_attrs() to use its own way to ask
a question and receive an answer to it, that is different from h
SZEDER Gábor writes:
> And a final sidenote: sorting based on the longest matching suffix
> also allows us to (ab)use version sort with prerelease suffixes to
> sort postrelease tags as we please, too:
>
> $ ~/src/git/git -c versionsort.prereleasesuffix=-alpha \
> -c versionso
On Wed, Oct 5, 2016 at 10:00 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> I thought about that, but as I concluded that the get_all_attrs doesn't need
>> conversion to a threading environment, we can keep it as is.
>
> I agree that it is OK for get_all_attrs() to use its own way to ask
Duy Nguyen writes:
>> At the least I think we should clarify this in the document.
>
> How about something like this? Would it help?
>
> -- 8< --
> Subject: [PATCH] git-commit.txt: clarify --patch mode with pathspec
>
> How pathspec is used, with and without --interactive/--patch, is
> different.
Mark messages in some perl scripts for translation.
Thanks for the reviews of Junio Hamano and Jakub Narębski. Although I think
Jakub Narębski's suggestions are overall good, I am not willing to go that path
because I cannot see huge benefits from them given what we already have and
also I lack P
Mark plural strings for translation. Unfold each action case in one
entire sentence.
Pass new keyword for xgettext to extract.
Update test to include new subroutine __n() for plural strings handling.
Update documentation to include a description of the new __n() subroutine.
Signed-off-by: Vasc
Mark message of edit_hunk_manually displayed in the editing file when
user chooses 'e' option. The message had to be unfolded to allow
translation of the $participle verb.
Some messages end up being exactly the same for some uses cases, but
left it for easier change in the future, e.g., wanting t
Mark messages in here-document without interpolation for translation.
The here-document delimiter \EOF, which is the same as 'EOF', indicate
that the text is to be treated literally without interpolation of its
content. Unfortunately xgettext is not able to extract here documents
with delimiter \
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 23 ---
1 file changed, 12 ins
Mark prompt message assembled in place for translation, unfolding each
use case for each entry in the %patch_modes hash table.
Previously, this script relied on whether $patch_mode was set to run the
command patch_update_cmd() or show status and loop the main loop. Now,
it uses $cmd to indicate we
Mark simple strings (without interpolation) for translation.
Brackets around first parameter of ternary operator is necessary because
otherwise xgettext fails to extract strings marked for translation from
the rest of the file.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 74 +++
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5 insertions
Mark help message of help_patch_cmd for translation. The message must
be unfolded to be free of variables so we can have high quality
translations.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 54 ---
1 file changed, 46 insertions(+),
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 52 ++--
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be4..78eb5
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d0..8d3632e 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path qw(m
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
I changed (y|N) to [y|N] around line 1750 to match with the
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 78eb59b..982c6c0 100755
--- a/gi
Mark words 'nothing', 'unchanged' and 'binary' used to display what has
been staged or not, in "git add -i" status command.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-add--interactive.perl b/git-
> On 04 Oct 2016, at 21:53, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> From: Lars Schneider
>>
>
>> +int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
>> +{
>> +static char buf[LARGE_PACKET_DATA_MAX];
>> +int err = 0;
>> +size_t bytes_
Johannes Schindelin writes:
> I briefly considered consolidating them and using .git/rebase-merge/ as
> state directory also for cherry-pick/revert, but that would cause
> problems: I am surely not the only user who cherry-picks commits manually
> while running interactive rebases.
Good thinking
Johannes Schindelin writes:
> Actually, come to think of it, I will change the patch, as it is too
> confusing. What I want is to preserve a positive return value in case of
> merge conflicts, and that is exactly what I should do instead of playing
> games with the Boolean OR operator.
That woul
sorga...@gmail.com writes:
> From: Sergey Organov
>
> "-m " is one of essential distinctions between obsolete
> invocation form and the recent one. Add it to the "usage" returned by
> 'git merge -h' for more clarity.
>
> Signed-off-by: Sergey Organov
> ---
> builtin/merge.c | 2 +-
> 1 file cha
sorga...@gmail.com writes:
> From: Sergey Organov
>
> This partial list of option is confusing as it lacks a lot of
> available options. It also clutters the SYNOPSIS making differences
> between forms of invocation less clear.
>
> Signed-off-by: Sergey Organov
> ---
> Documentation/git-merge.t
sorga...@gmail.com writes:
> From: Sergey Organov
>
> Old description not only raised the question of why the tool is called
> git-merge rather than git-join, but "join histories" also sounds like
> very simple operation, something like what "git-merge -s ours" does.
>
> Signed-off-by: Sergey Org
On Wed, Oct 05, 2016 at 05:46:22PM +0300, sorga...@gmail.com wrote:
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 216d2f4..cc0329d 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -3,7 +3,8 @@ git-merge(1)
>
> NAME
>
>
sorga...@gmail.com writes:
> From: Sergey Organov
>
> Old description had a few problems:
>
> - sounded as if commits have changes
>
> - stated that changes are taken since some "divergence point"
> that was not defined.
>
> New description rather uses "common ancestor" and "merge base",
> defi
On Wed, Oct 05, 2016 at 09:13:53AM -0700, Junio C Hamano wrote:
> Heiko Voigt writes:
>
> >> It IS a hack, but having this information in .git would
> >> mean that it can be forced to be in machine readable form, unlike a
> >> mention in README. I do not know if the .gitmodules/.gitignore
> >> c
Am 03.10.2016 um 22:36 schrieb Jeff King:
There's no way to get the list of alternates that git
computes internally; our tests only infer it based on which
objects are available. In addition to testing, knowing this
list may be helpful for somebody debugging their alternates
setup.
Let's add it
Am 03.10.2016 um 22:33 schrieb Jeff King:
This series is the result of René nerd-sniping me with the claim that we
could "easily" teach count-objects to print out the list of alternates
in:
http://public-inbox.org/git/c27dc1a4-3c7a-2866-d9d8-f5d3eb161...@web.de/
1. Send crappy patch
2.
Am 03.10.2016 um 22:34 schrieb Jeff King:
When we add a new alternate to the list, we try to normalize
out any redundant "..", etc. However, we do not look at the
return value of normalize_path_copy(), and will happily
continue with a path that could not be normalized. Worse,
the normalizing proc
sorga...@gmail.com writes:
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 351b8fc..ba5fb0a 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -23,10 +23,6 @@ named commits and the current branch, called "merge base",
> is
> calcu
W dniu 03.10.2016 o 22:49, Jeff King pisze:
> diff --git a/connected.h b/connected.h
> index afa48cc..4ca325f 100644
> --- a/connected.h
> +++ b/connected.h
> @@ -33,6 +33,11 @@ struct check_connected_options {
>
> /* If non-zero, show progress as we traverse the objects. */
> int pr
On Wed, Oct 05, 2016 at 08:47:29PM +0200, René Scharfe wrote:
> > Instead, let's provide a strbuf helper that does an in-place
> > normalize, but restores the original contents on error. This
> > uses a second buffer under the hood, which is slightly less
> > efficient, but this is not a performan
> On 04 Oct 2016, at 21:33, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> From: Lars Schneider
>>
>>
>> +static int packet_write_gently(const int fd_out, const char *buf, size_t
>> size)
>> +{
>> +static char packet_write_buffer[LARGE_PACKET_MAX];
>> +const size_t
On Wed, Oct 05, 2016 at 09:01:57PM +0200, Jakub Narębski wrote:
> > diff --git a/connected.h b/connected.h
> > index afa48cc..4ca325f 100644
> > --- a/connected.h
> > +++ b/connected.h
> > @@ -33,6 +33,11 @@ struct check_connected_options {
> >
> > /* If non-zero, show progress as we travers
W dniu 04.10.2016 o 15:05, Johannes Schindelin pisze:
> Subject: Export also the has_un{staged,committed}_changed() functions
s/changed/changes/ that is d -> s
Those are has_unstaged_changes() and has_uncommitted_changes().
Though I wonder if "other has_un*_changes() functions" would be
mor
W dniu 04.10.2016 o 15:06, Johannes Schindelin pisze:
> The previous code still followed the old git-pull.sh code which did not
> adhere to our new convention.
Good to know why it used its own convention.
> Signed-off-by: Johannes Schindelin
> ---
> builtin/pull.c | 2 +-
> wt-status.c| 6
Jacob Keller writes:
>> The cost of fill function having to do the same thing repeatedly is
>> negligible, so I am OK with the result, but for fairness, this was
>> not "make the callers do this extra thing", but was "the caller can
>> prepare these unchanging parts just once, and the fill functi
On 10/04/2016 10:25 AM, Junio C Hamano wrote:
So I would say it is perfectly OK if your update works only for
cases we can clearly define the semantics for. For example, we can
even start with something simple like:
* A RFC822-header like line, together with any number of whitespace
indente
On 10/04/2016 11:28 AM, Junio C Hamano wrote:
An addendum. We may also want to be prepared to accept an input
that has some garbage lines _after_ the trailer block, if we can
clearly identify them as such. For example, we could change the
definition of "the last paragraph" as "the block of line
Jakub Narębski writes:
>> +
>> +This command is used by 'git pull' to incorporate changes from another
>> +repository, and can be used by hand to merge changes from one branch
>> +into another.
>
> Rather "can be used by 'git pull'", or "is used by 'git pull' (unless
> configured otherwise)"...
Signed-off-by: Ramsay Jones
---
Hi Lars,
Commit 6007c69e ("run-command: add wait_on_exit", 04-10-2016), which
is part of your 'ls/filter-process' branch, causes the build to fail
on cygwin, since 'stdin' is defined as a macro thus:
#define stdin (_REENT->_stdin)
(you can probably guess
Jonathan Tan writes:
> Sounds reasonable to me. Would the "[" be a bit of overspecification,
> though, since Git doesn't produce it? Also, identifying it as a
> garbage line probably wouldn't change any behavior - in the Linux
> kernel examples, it is used to show what happened in between
> sign-
Junio C Hamano writes:
> sorga...@gmail.com writes:
>
>> From: Sergey Organov
>>
>> "-m " is one of essential distinctions between obsolete
>> invocation form and the recent one. Add it to the "usage" returned by
>> 'git merge -h' for more clarity.
>>
>> Signed-off-by: Sergey Organov
>> ---
>>
Jeff King writes:
> On Wed, Oct 05, 2016 at 05:46:22PM +0300, sorga...@gmail.com wrote:
>
>> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
>> index 216d2f4..cc0329d 100644
>> --- a/Documentation/git-merge.txt
>> +++ b/Documentation/git-merge.txt
>> @@ -3,7 +3,8 @@ git-mer
> On 04 Oct 2016, at 21:30, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> From: Lars Schneider
>>
>> The flag 'clean_on_exit' kills child processes spawned by Git on exit.
>> A hard kill like this might not be desired in all cases.
>>
>> Add 'wait_on_exit' which closes the
Junio C Hamano writes:
> sorga...@gmail.com writes:
>
>> From: Sergey Organov
>>
>> Old description not only raised the question of why the tool is called
>> git-merge rather than git-join, but "join histories" also sounds like
>> very simple operation, something like what "git-merge -s ours" do
Junio C Hamano writes:
> sorga...@gmail.com writes:
>
>> From: Sergey Organov
>>
>> This partial list of option is confusing as it lacks a lot of
>> available options. It also clutters the SYNOPSIS making differences
>> between forms of invocation less clear.
>>
>> Signed-off-by: Sergey Organov
1 - 100 of 120 matches
Mail list logo
