On Sun, Apr 03, 2016 at 02:19:53AM +0100, Ramsay Jones wrote:
>
>Signed-off-by: Ramsay Jones
>---
>
>Hi Xiaolong,
>
>When you next re-roll your 'xy/format-patch-base' branch could you
>please squash this (or something like it) into the relevant patch.
>(commit 50ff6afd, "format-patch: add '--base'
"tous le dépôts distants" -> "tous les dépôts distants"
---
po/fr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/fr.po b/po/fr.po
index 88b0b8a7..36c7c99 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6135,7 +6135,7 @@ msgstr "git fetch --all []"
#: builtin/fetch.c:92 built
At Fri, 8 Apr 2016 23:02:18 +0900,
Kazuki Yamaguchi wrote:
>
> [1/2]
> Check for LOGINDISABLED capability only when using LOGIN command, as it
> is unrelated to authentication with CRAM-MD5.
>
> [2/2]
> Remove extra + 1, which is probably mistakenly added. Without this patch
> I can't open my IMA
On Fri, Apr 8, 2016 at 10:01 PM, Jeff King wrote:
> I do agree that --date-order on a linear parent walk cannot change the
> ordering (which guarantees child-before-parent), and is a noop. But
> note that not all first-parent invocations are strictly linear. For
> example:
>
> git log --first-pa
On Fri, Apr 08, 2016 at 08:55:54PM -0700, Josiah Boning wrote:
> As measured on linux.git, adding --date-order to a log command can
> result in a significant slowdown (~25x here; I've seen ~100x on other
> repositories):
>
> $ time git log --first-parent --max-count=51 master > /dev/null
>
Elijah Newren writes:
> On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote:
>> Elijah Newren writes:
>>
>> The goal is stated rather vaguely--when you have a working tree and
>> perform this "in index" merge, you would obviously update the index
>> with the merge result and ...
>
> Yes, I th
As measured on linux.git, adding --date-order to a log command can
result in a significant slowdown (~25x here; I've seen ~100x on other
repositories):
$ time git log --first-parent --max-count=51 master > /dev/null
real0m0.024s
user0m0.006s
sys0m0.016s
$ time git l
On Fri, Apr 8, 2016 at 6:01 AM, Michael J Gruber
wrote:
> I haven't looked at your series thoroughly but immediately had to think
> of 'tr/remerge-diff' (on 'pu'), see
> http://permalink.gmane.org/gmane.comp.version-control.git/256591
>
> There, Thomas used index-only merge to reproduce an automat
Hi,
On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote:
> Elijah Newren writes:
>
> The goal is stated rather vaguely--when you have a working tree and
> perform this "in index" merge, you would obviously update the index
> with the merge result and ...
Yes, I think you hit the nail on the h
Elijah Newren writes:
> Subject: Re: [RFC/PATCH 01/18] Remove duplicate code
Subject: [RFC/PATCH 01/18] merge-recursive: remove duplicate code
> In commit 51931bf (merge-recursive: Improve handling of rename target vs.
> directory addition, 2011-08-11) I apparently added two lines of code that
Elijah Newren writes:
> +--index-only::
> + Perform merge on index only, leaving working tree alone. Most
> + users do NOT want to use this flag, as it will leave the
> + working tree and the index completely out of sync, which is
> + very likely to confuse users and prevent a su
On Fri, 2016-04-08 at 18:26 +0700, Duy Nguyen wrote:
> On Thu, Apr 7, 2016 at 5:11 AM, David Turner <
> dtur...@twopensource.com> wrote:
> > @@ -1045,4 +1046,21 @@ struct tm *git_gmtime_r(const time_t *,
> > struct tm *);
> > #define getc_unlocked(fh) getc(fh)
> > #endif
> >
> > +#ifdef __linux_
On Fri, 2016-04-08 at 13:43 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > Would you like
> > me to re-roll with my sign-off, or would you prefer to add it
> > yourself?
>
> I take it that you see no other reason to reroll the series at this
> point (otherwise you wouldn't be asking ;
David Turner writes:
> Would you like
> me to re-roll with my sign-off, or would you prefer to add it yourself?
I take it that you see no other reason to reroll the series at this
point (otherwise you wouldn't be asking ;-), so I'll check which
ones need amending and add them.
Thanks.
--
To uns
Vasco Almeida writes:
> Add a comma to string marked for translation. Make the string match the
> one in rm.c. Now translators have do handle this string only once.
I suspect these "comma after Please" is a French invention.
Aiming to reduce these minor variants is a good goal, but wouldn't
we
Vasco Almeida writes:
> Some translations might also translate "" and "".
> ...
> fprintf_ln(stderr, _("See git-pull(1) for details."));
> fprintf(stderr, "\n");
> - fprintf_ln(stderr, "git pull ");
> + fprintf_ln(stderr, _("git pull "
Vasco Almeida writes:
> + gettextln "You are not currently on a branch."
> + if test $op_type = "rebase"
if test "$op_type" = rebase
that is, $op_type could be an empty string that 'test' may not even
see hence it should be double-quoted to ensure 'test' sees an
Vasco Almeida writes:
> Subject: Re: [PATCH 1/7] l10n: index-pack: use plural string instead of
> normal one
These are probably better prefixed with "i18n:" (i.e. enable
translation into many languages) not "l10n:" (i.e. actually
translate for languages).
> Git could output "completed with 1 l
Vasco Almeida writes:
> Mark strings seen by the user inside setup_unpack_trees_porcelain() and
> display_error_msgs() functions for translation.
>
> One case Git outputs the named strings is when the user does some editing to
> a file on some branch and then checks out other branch, but that fil
Junio C Hamano writes:
> Elijah Newren writes:
>
>> +test_expect_failure '--index-only with rename/modify works in
>> non-bare-clone' '
>> +git checkout B^0 &&
>> +
>> +git merge --index-only -s recursive C^0 &&
>> +
>> +echo "Making sure the working copy was not updated" &&
>> +
Split string "If you wish to set tracking information
for this branch you can do so with:\n" to match occurring string in
git-parse-remote.sh. In this case, the translator handles it only once.
On the other hand, the translations of the string that were already made
are mark as fuzzy and the trans
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7b45b6b..5ab106b 100644
--- a/builtin/branch.c
+++ b/builti
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..a99d6b9 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -458,13 +458,13 @
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 49
Add a comma to string marked for translation. Make the string match the
one in rm.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index aeae855..
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/index-pack.c
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
One case Git outputs the named strings is when the user does some editing to
a file on some branch and then checks out other branch, but that file
changes by the checkout. This i
Elijah Newren writes:
> +test_expect_failure '--index-only with rename/modify works in
> non-bare-clone' '
> + git checkout B^0 &&
> +
> + git merge --index-only -s recursive C^0 &&
> +
> + echo "Making sure the working copy was not updated" &&
> + test ! -f b &&
> + test -f
Elijah Newren writes:
> Signed-off-by: Elijah Newren
> ---
> git-merge-octopus.sh | 5 +
> t/t6044-merge-unrelated-index-changes.sh | 21 ++---
> 2 files changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/git-merge-octopus.sh b/git-merge-octopus
On Fri, 2016-04-08 at 11:14 -0400, Michael Haggerty wrote:
> On 04/07/2016 03:02 PM, David Turner wrote:
> > From: Michael Haggerty
> >
> > Signed-off-by: Michael Haggerty
> > [...]
>
> David, even though I wrote these patches, I believe you need to sign
> them off too since you are the one sub
Felix Ruess writes:
> I just encountered a problem with the latest git version (2.8.1) that
> looks like a regression to me:
> When trying to clone a repo via a https socks5 proxy the connection times out:
>
> $ git config --global 'http.proxy=socks5h://127.0.0.1:1080'
The first version of Git t
On vr, 2016-04-08 at 20:46 +0200, Felix Ruess wrote:
> Hi all,
>
> I just encountered a problem with the latest git version (2.8.1) that
> looks like a regression to me:
> When trying to clone a repo via a https socks5 proxy the connection
> times out:
>
> $ git config --global 'http.proxy=socks5
Hi all,
I just encountered a problem with the latest git version (2.8.1) that
looks like a regression to me:
When trying to clone a repo via a https socks5 proxy the connection times out:
$ git config --global 'http.proxy=socks5h://127.0.0.1:1080'
$ export GIT_CURL_VERBOSE=1
$ git clone https://f
Kazuki Yamaguchi writes:
> Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod
> is specified.
>
> LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should
> be allowed, or we can't connect to IMAP servers which only accepts
> AUTHENTICATE command.
Makes sense
On Fri, Apr 8, 2016 at 11:30 AM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> So if I want to get the summary of a patch out of a commit without the
>> actual diff what would you suggest?
>
> "git log --stat"?
>
> If you have a set of (discrete) commits, "git show --stat A B C"?
>
>> Basical
Jacob Keller writes:
> So if I want to get the summary of a patch out of a commit without the
> actual diff what would you suggest?
"git log --stat"?
If you have a set of (discrete) commits, "git show --stat A B C"?
> Basically, I have a process where we have post processed code, and I
> want
On Mon, Apr 4, 2016 at 12:32 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> Documentation/diff-options.txt | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
>> index 306b7e3..6eb591f 100644
>> --- a/Documentation/
On Thu, Apr 7, 2016 at 2:30 PM, Eric Sunshine wrote:
> On Thu, Apr 7, 2016 at 12:46 PM, Jacob Keller
> wrote:
>> The documentation for format-patch indicates that --no-patch wilL
>> suppress patch output. It also incorrectly mentions that -s will also
>> suppress the patch output, but this is in
Elijah Newren writes:
> This patch series adds an --index-only flag to git merge, the idea
> being to allow a merge to be performed entirely in the index without
> touching (or even needing) a working tree.
The goal is stated rather vaguely--when you have a working tree and
perform this "in inde
Thanks. Will queue.
--
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
Jan Kundrát writes:
> this patch makes it possible to use --show-linear-break in `git log
> --graph --oneline --all`.
You have multiple roots, just like we would show the histories like
this:
* A
|\
| * B
| * C (root)
*D
*E (another root)
teaching the "g
Eric Sunshine writes:
> On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote:
>> Current implementation of parse-options.c treats OPT__QUIET() as integer
>> and not boolean and thus it is more appropriate to print it as integer
>> to avoid confusion.
>
> I can buy this line of reasoning, however,
SSL_CTX_new() may fail with return value NULL.
Signed-off-by: Kazuki Yamaguchi
---
imap-send.c | 4
1 file changed, 4 insertions(+)
diff --git a/imap-send.c b/imap-send.c
index 0364b326e109..c5e24a35491d 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -298,6 +298,10 @@ static int ssl_socket_
Use SSLv23_method always and disable SSL if needed.
TLSv1_method() function is deprecated in OpenSSL 1.1.0 and the compiler
emits a warning.
SSLv23_method() is also deprecated, but the alternative, TLS_method(),
is new in OpenSSL 1.1.0 so requires checking by configure. Stick to
SSLv23_method() f
Fix compile errors with OpenSSL 1.1.0.
HMAC_CTX is made opaque and HMAC_CTX_cleanup is removed in OpenSSL
1.1.0. But since we just want to calculate one HMAC, we can use HMAC()
here, which exists since OpenSSL 0.9.6 at least.
Signed-off-by: Kazuki Yamaguchi
---
Since I don't have OS X machines,
We don't need it, as we no longer use HMAC_CTX_cleanup() directly.
Signed-off-by: Kazuki Yamaguchi
---
Makefile | 6 --
configure.ac | 4
git-compat-util.h | 3 ---
3 files changed, 13 deletions(-)
diff --git a/Makefile b/Makefile
index 2742a6977c6a..47ccb0042591 100644
-
OpenSSL 1.1.0 is not released yet, but the first beta 1.1.0-pre4 was
released on Mar 16[1]. According to the OpenSSL's web site[2], only bug
fixes will be applied after beta release, and 1.1.0 final will be in a
month or two.
Thanks,
[1] https://mta.openssl.org/pipermail/openssl-announce/2016-Mar
On 04/07/2016 03:02 PM, David Turner wrote:
> From: Michael Haggerty
>
> Signed-off-by: Michael Haggerty
> [...]
David, even though I wrote these patches, I believe you need to sign
them off too since you are the one submitting them to the list (it's a
chain-of-custody sort of thing).
It's pos
Hi David,
On Thu, 7 Apr 2016, David Turner wrote:
> On Thu, 2016-04-07 at 16:14 +0200, Johannes Schindelin wrote:
> >
> > On Thu, 7 Apr 2016, Johannes Sixt wrote:
> >
> > > Am 07.04.2016 um 00:11 schrieb David Turner:
> > > > +static void share_index(struct index_state *istate, struct shm
> > >
On Fri, Apr 08, 2016 at 01:42:12PM +0200, Matthieu Moy wrote:
> Johannes Schindelin writes:
>
> > git revert -n deadbeef
> > git commit --squash deadbeef
> >
> > where "deadbeef" is the placeholder for the actual commit to revert.
> >
> > And indeed, I use exactly this song and dance quit
[1/2]
Check for LOGINDISABLED capability only when using LOGIN command, as it
is unrelated to authentication with CRAM-MD5.
[2/2]
Remove extra + 1, which is probably mistakenly added. Without this patch
I can't open my IMAP server (Dovecot 2.2).
Thanks,
Kazuki Yamaguchi (2):
imap-send: check f
Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod
is specified.
LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should
be allowed, or we can't connect to IMAP servers which only accepts
AUTHENTICATE command.
Signed-off-by: Kazuki Yamaguchi
---
imap-send.c
Remove extra + 1 from resp_len, the length of the byte sequence to be
Base64 encoded and passed to the server as the response. Or the response
incorrectly contains an extra \0.
Signed-off-by: Kazuki Yamaguchi
---
imap-send.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ima
Elijah Newren venit, vidit, dixit 08.04.2016 08:58:
> This patch series adds an --index-only flag to git merge, the idea
> being to allow a merge to be performed entirely in the index without
> touching (or even needing) a working tree.
>
> The core fix, to merge-recursive, was actually quite easy
On Fri, Apr 08, 2016 at 01:21:07PM +0200, Jan Kundrát wrote:
> From 1ac6bb7c31652835d3d046c82e423f0cea6e0904 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Jan=20Kundr=C3=A1t?=
> Date: Fri, 8 Apr 2016 13:06:31 +0200
> Subject: [PATCH] log: allow --graph and --show-linear-break used together
> MIME-Ver
On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen wrote:
> On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo wrote:
>> Executing `git-rev-parse --git-common-dir` from the root of the main
>> worktree results in '.git', which is the relative path to the git dir.
>> When executed from a subpath of the main
On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo wrote:
> Executing `git-rev-parse --git-common-dir` from the root of the main
> worktree results in '.git', which is the relative path to the git dir.
> When executed from a subpath of the main tree it returned somthing like:
> 'sub/path/.git'. Cha
On 08.04.16 12:01, chenjinlei wrote:
>
> I’m encounter a problem due to my own stupidity…
> #1 I pushed a project named Android to my repository.
> #2 I `mv Android android`, cause I think it’s no good to use the uppercase as
> my project name.
> #3 I pushed it to my repository again…
>
> I foun
On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
>
> > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> > >
> > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
> > >
> > > > Reverts can typ
Johannes Schindelin writes:
> git revert -n deadbeef
> git commit --squash deadbeef
>
> where "deadbeef" is the placeholder for the actual commit to revert.
>
> And indeed, I use exactly this song and dance quite frequently, *iff* my
> intention is to drop a patch.
>
> A much better i
"Michael S. Tsirkin" writes:
> Doing this automatically for all users might be a bit too drastic for
> the upstream git. So there could be an option, or something - if
> there's interest I can add that. I thought I'd test the waters before
> I spend time on that.
If the goal is to test the wate
On Tue, Apr 5, 2016 at 10:39 PM, Pranit Bauva wrote:
> [+cc:Duy Nguyen, Jonathan Nieder]
>
> On Mon, Apr 4, 2016 at 3:00 AM, Eric Sunshine wrote:
>> On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote:
>>> Current implementation of parse-options.c treats OPT__QUIET() as integer
>>> and not boolea
Hi,
this patch makes it possible to use --show-linear-break in `git log --graph
--oneline --all`.
(Please Cc me on replies, I'm not subscribed to the Git ML.)
Cheers,
Jan
--
Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/From 1ac6bb7c31652835d3d046c82e423f0cea6e0904 Mon Se
On Thu, Apr 7, 2016 at 5:11 AM, David Turner wrote:
> @@ -1045,4 +1046,21 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
> #define getc_unlocked(fh) getc(fh)
> #endif
>
> +#ifdef __linux__
> +#define UNIX_PATH_MAX 108
> +#elif defined(__APPLE__) || defined(BSD)
> +#define UNIX_PATH_MAX
Hi Michael,
On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
> On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> >
> > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
> >
> > > Reverts can typically be treated like squash. Eliminating both the
> > > original commit and the reve
I’m encounter a problem due to my own stupidity…
#1 I pushed a project named Android to my repository.
#2 I `mv Android android`, cause I think it’s no good to use the uppercase as
my project name.
#3 I pushed it to my repository again…
I found that there `Adnroid` and `android` exist in my repo
Emit an informative error when failed to hold lock of HEAD.
2233066 (refs: add a new function set_worktree_head_symref) added
set_worktree_head_symref() but this is missing a call to
unable_to_lock_message() after hold_lock_file_for_update() fails, so it
emits an empty error message:
% git bran
Including both tests which can be handled without calling the actual
git-merge-resolve program (because the merge is trivially resolvable
without worrying about 3-way file merges), and ones that do need it to be
invoked.
Signed-off-by: Elijah Newren
---
t/t6043-merge-index-only.sh | 104
The merge-recursive logic already had the ability to ignore the working
directory and operate entirely on the index -- it needed to do this when
creating a virtual merge base, i.e. when o->call_depth > 0.
The only trick here is that o->call_depth > 0 was also checked to
determine whether all merge
In commit 51931bf (merge-recursive: Improve handling of rename target vs.
directory addition, 2011-08-11) I apparently added two lines of code that
were immediately duplicated a few lines later. No idea why, other than
it seems pretty clear this was a mistake: there is no need to remove the
same f
Signed-off-by: Elijah Newren
---
git-merge-octopus.sh| 14 +++---
t/t6043-merge-index-only.sh | 4 ++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index a1d7702..e7915dc 100755
--- a/git-merge-octopus.sh
+++ b/git-m
From: Elijah Newren
Signed-off-by: Elijah Newren
---
builtin/merge.c | 1 +
builtin/pull.c | 4 ++--
cache.h | 1 +
merge.c | 4 +++-
sequencer.c | 2 +-
t/t6043-merge-index-only.sh | 6 +++---
6 files changed, 11
Signed-off-by: Elijah Newren
---
git-merge-octopus.sh | 5 +
t/t6044-merge-unrelated-index-changes.sh | 21 ++---
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 8643f74..a1d7702 100755
---
Subsequent commits will add implementation for each relevant merge strategy
Signed-off-by: Elijah Newren
---
Documentation/git-merge.txt | 14 ++
builtin/merge.c | 7 +++
git.c | 2 +-
merge-recursive.c | 1 +
merge-recursive.h
Signed-off-by: Elijah Newren
---
t/t6043-merge-index-only.sh | 70 +
1 file changed, 70 insertions(+)
diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh
index b8b22ab..67c8e92 100755
--- a/t/t6043-merge-index-only.sh
+++ b/t/t6043-m
Signed-off-by: Elijah Newren
---
builtin/merge-index.c | 9 -
builtin/merge.c | 2 +-
cache.h | 2 +-
merge.c | 4 +++-
sequencer.c | 2 +-
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/builtin/merge-index.c b/builtin/merge-ind
Signed-off-by: Elijah Newren
---
t/t6043-merge-index-only.sh | 41 +
1 file changed, 41 insertions(+)
diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh
index 4c3c40a..b01bf79 100755
--- a/t/t6043-merge-index-only.sh
+++ b/t/t6043-merge
Signed-off-by: Elijah Newren
---
t/t6043-merge-index-only.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh
index 84c6640..5eda6b3 100755
--- a/t/t6043-merge-index-only.sh
+++ b/t/t6043-merge-index-
78 matches
Mail list logo
