Hi,
Git v2.6.0-rc0 has been released, and it's time to start new round of git l10n.
This time there are 123 updated messages need to be translated since last
update:
l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)
Generate po/git.pot from v2.6.0-rc0-24-gec371ff for git v2.6.0 l10n
On Fri, Sep 4, 2015 at 6:23 PM, Junio C Hamano wrote:
>
> OK, I didn't know that was acceptable in the kernel community
> to have random comments like that inside the block. Can these
> comments span multiple paragraphs? What I am wondering is what
> you want to see in a case like this:
>
>
Linus Torvalds writes:
> On Fri, Sep 4, 2015 at 6:06 PM, Junio C Hamano wrote:
>>
>> that rule would still not think this is a signature block, but at
>> that point, do we really want to consider such a block of text a
>> signature block?
>
> So exactly why are you arguing for these rules that a
Linus Torvalds writes:
> The thing is, and that was what the report was all about, not every
> line _is_ of that format. We have commetns from the sign-off people.
> Things like this:
>
> Signed-off-by: Noam Camus
> Acked-by: Vineet Gupta
> [ Also removed pointless cast from "void *
On Fri, Sep 4, 2015 at 6:06 PM, Junio C Hamano wrote:
>
> that rule would still not think this is a signature block, but at
> that point, do we really want to consider such a block of text a
> signature block?
So exactly why are you arguing for these rules that are known to break
in real life, th
Linus Torvalds writes:
> but the failing cases have a comment by Andrew:
>
> [a...@linux-foundation.org: coding-style fixes]
> Signed-off-by: Tang Chen
> Cc: Xishi Qiu
> Cc: Yasuaki Ishimatsu
> Cc: Kamezawa Hiroyuki
> Cc: Taku Izumi
> Cc: Gu Zheng
> Cc: Naoya
On Fri, Sep 4, 2015 at 5:54 PM, Junio C Hamano wrote:
>
> How about a bit looser rule like this?
>
> A block of text at the end of the message, each and every
> line in which must match "^[^: ]+:[ ]" (that is,
> a "keyword" that does not contain a whitespace nor a colon,
>
Linus Torvalds writes:
> So I think that logic should basically be extended to saying
>
> - if any line in the last chunk has a "Signed-off-by:", set a flag.
>
> - at the end of the loop, if that flag wasn't set, return 0.
I am reluctant to special case S-o-b: too much, even though this is
abo
On Fri, Sep 4, 2015 at 5:07 PM, Jeff King wrote:
>
> Do we want to make Signed-off-by a special token here? What about "Cc:",
> and other project-specific trailers? You wouldn't want to end up with:
>
> [some comment]
> Cc: somebody
>
> Signed-off-by: somebody else
>
> It's not a problem for
Junio,
I can appreciate the amount of clutter you'd get with the ancient
behavior. That said, I'd be willing to live with it. I personally
prefer to see all the branches coming and going - if the branches are
good enough for upstream, they're good enough for me (I'm really good
an ignoring stuff
On Fri, Sep 04, 2015 at 04:52:42PM -0700, Linus Torvalds wrote:
> On Fri, Sep 4, 2015 at 4:47 PM, Linus Torvalds
> wrote:
> >
> > I *think* it's this part:
> >
> > if (!(found_rfc2822 ||
> > is_cherry_picked_from_line(buf + i, k - i - 1)))
> >
On Fri, Sep 4, 2015 at 4:47 PM, Linus Torvalds
wrote:
>
> I *think* it's this part:
>
> if (!(found_rfc2822 ||
> is_cherry_picked_from_line(buf + i, k - i - 1)))
> return 0;
>
> which basically returns 0 for _any_ line in the footer tha
Ok, this may not be new either, but I'm trying to be careful when
using "git am" these days, because I know it got rewritten.
And I _think_ the whitespace handling for adding sign-offs got scrogged.
I just applied the usual patch-bomb from Andrew, and several of the
commits (but not all) end up l
Alexey Shumkin writes:
> Some repositories may have spaces in their paths. Currently `git-subtree`
> raises an error in such cases.
> Also, `git-subtree` currently does not have tests for its 'push' command.
> Following patches are to fix these statements.
>
> Alexey Shumkin (2):
> t7900-subtre
Ben Boeckel writes:
> + url_nr = 0;
> + if (push_mode) {
> + url = remote->pushurl;
> + url_nr = remote->pushurl_nr;
> + }
> +
> + /* Fall back to the fetch URL if no push URLs are set. */
> + if (!url_nr) {
> + url = remote->url;
> +
On Fri, Sep 04, 2015 at 05:44:54PM -0400, Jeff King wrote:
> > Just to make sure I got you correctly, you are saying that "we
> > propagate, but that is not correct. We should stop doing so", right?
>
> Exactly. We do not propagate config over git:// or http:// (because we
> do not share our envi
In common case there can be spaces in a subdirectory name. Change tests
accorgingly to this statement.
Also, as far as a call to the `rejoin_msg` function (in `cmd_split`)
does not take into account such a case this patch fixes commit message
when `--rejoin` option is set .
Besides, as `fixnl` an
Remote repository may have spaces in its path, so take it into account.
Also, as far as there are no tests for the `push` command, add them.
Signed-off-by: Alexey Shumkin
---
contrib/subtree/git-subtree.sh | 2 +-
contrib/subtree/t/t7900-subtree.sh | 47
Some repositories may have spaces in their paths. Currently `git-subtree`
raises an error in such cases.
Also, `git-subtree` currently does not have tests for its 'push' command.
Following patches are to fix these statements.
Alexey Shumkin (2):
t7900-subtree: test the "space in a subdirectory n
John Medema writes:
> Option D has the downside that it changes the behavior of more code
> (cmdline and gui), which is why I didn't suggest it before. It also
> has the downside of making the branch list longer. But that's the
> nature of cloning; if I copy a full directory of files to a new
>
Jeff King writes:
> Perhaps we should reconsider whether f4c3edc (vreportf: avoid
> intermediate buffer, 2015-08-11) is a good idea. Note that snprintf is
> not on the list of safe functions, but I imagine that in practice it is
> fine. Though just avoiding error()/warning() in signal handlers m
On Fri, Sep 04, 2015 at 11:18:01AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > It shouldn't be necessary for $GIT_DIR, but it makes sense for other git
> > variables. E.g., with "AcceptEnv GIT_*", "git -c" config is propagated.
> > E.g.:
> > ...
>
> Just to make sure I got you correc
Josh Rabinowitz writes:
> Hi Junio and other recipients:
>
> Junio, thanks for your response. I think you may have misunderstood my
> patch though (or I am misunderstanding your responses), because it
> seems we are actually in agreement.
>
> 1) My original patch is to make 'git push --porcelain
The code formerly in branch.c was largely the basis of the
get_worktree_list implementation is now moved to worktree.c,
and the find_shared_symref implementation has been refactored
to use get_worktree_list
Signed-off-by: Michael Rappazzo
---
branch.c| 79 +---
'git worktree list' iterates through the worktree list, and outputs
the worktree dir. By default, only the worktree path is output.
Supported options include:
--skip-bare: do not output bare worktrees
--verbose: include the current head and ref (if applicable), also
Including functions to get the list of all worktrees, and to get
a specific worktree (primary or linked).
Signed-off-by: Michael Rappazzo
---
Makefile | 1 +
worktree.c | 157 +
worktree.h | 48 +++
3 files changed,
This series represents a major rewrite of the previous series. It introduces
a top-level worktree.c which includes `get_worktree_list` and `get_worktree`
functions, and it also moves the `find_shared_symref` from branch.c to
worktree.c
Michael Rappazzo (3):
worktree: add top-level worktree.c
On Fri, Sep 4, 2015 at 8:18 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> It shouldn't be necessary for $GIT_DIR, but it makes sense for other git
>> variables. E.g., with "AcceptEnv GIT_*", "git -c" config is propagated.
>> E.g.:
>> ...
>
> Just to make sure I got you correctly, you are say
On Fri, Sep 4, 2015 at 2:34 PM, Junio C Hamano wrote:
> Gábor Bernát writes:
>> +echo $(date +%s) | grep -q '^[0-9]+$'; 2>/dev/null && show_seconds=t
>
> That is very strange construct. I think you meant to say something
> like
>
> if date '+%s' 2>/dev/null | grep -q '^[0-9][0-9]*$'
>
On 9/4/2015 2:10 PM, Junio C Hamano wrote:
On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi wrote:
If you have a commit that exists on two branches, in gitk you can mark one,
then select the other and choose to compare the two. This results in a diff
of the two diffs, rather than a diff between the
John Keeping writes:
> All are harmless at the moment and t7610 and t5801 can be fixed by
> moving the test_when_finished call out of the subshell relatively
> easily.
>
> t7800 (in its final test) calls test_config in a subshell which has cd'd
> into a submodule.
>
> Is this something worth worr
David,
Option C - when you say "[in git-cola] when the remote branch is
selected it strips of the remote part and automatically fills in the
name field with that", are you referring to the Branch Create screen
or the Branch Checkout screen? Your description matches the Create
screen. And for wha
Gábor Bernát writes:
> @@ -277,9 +277,43 @@ test $commits -eq 0 && die "Found nothing to rewrite"
> # Rewrite the commits
>
> git_filter_branch__commit_count=0
This is not a new problem, but I wonder why we need such a
cumbersomely long variable name. It is not like this is a part of
some s
Jeff King writes:
> It shouldn't be necessary for $GIT_DIR, but it makes sense for other git
> variables. E.g., with "AcceptEnv GIT_*", "git -c" config is propagated.
> E.g.:
> ...
Just to make sure I got you correctly, you are saying that "we
propagate, but that is not correct. We should stop d
On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi wrote:
> If you have a commit that exists on two branches, in gitk you can mark one,
> then select the other and choose to compare the two. This results in a diff
> of the two diffs, rather than a diff between the two trees, which include
> many other ch
On Thu, Sep 3, 2015 at 9:53 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote:
>>> Implement an `align` atom which left-, middle-, or right-aligns the
>>> content between %(align:..) and %(end).
>>
>> Spell this either %(align:) or %(align
If you have a commit that exists on two branches, in gitk you can mark
one, then select the other and choose to compare the two. This results
in a diff of the two diffs, rather than a diff between the two trees,
which include many other changes that have nothing to do with either commit.
Is t
A recent thread [0] made me realise that using test_when_finished in a
subshell is likely to be a bug, since the change to $test_cleanup will
be lost when the subshell exits.
There is no POSIX way to detect that we are in a subshell ($$ and $PPID
are specified to remain unchanged), but we can dete
> On Sep 4, 2015, at 7:03 AM, Jeff King wrote:
>
> Is it possible that git _is_ producing the hit, but it is getting eaten
> by the pager or something like that? Does "git --no-pager grep
> enter_lplu" produce the same results?
Well what do you know. Adding --no-pager gave me the right results.
Stefan Beller writes:
> On Wed, Sep 2, 2015 at 10:58 AM, Junio C Hamano wrote:
>
>> * The individual qualities of the students we got this year must
>>have been a major factor. This we can indirectly influence by
>>having a very engaging microproject period, I think, and we did
>>s
Jeff King writes:
> On Thu, Sep 03, 2015 at 12:00:58PM +0200, Johannes Schindelin wrote:
>
>> In short: for users and contributors of Git for Windows, nothing
>> changes. Except that Pull Requests and issues may be dealt with more
>> swiftly, and that I will actively work on keeping Git for Windo
Michael J Gruber writes:
> How would it? "--left-right" information is requested specifically and
> not overridden. Root information is not requested specifically [by the
> user].
If this "highlight root prominently" were a config, then using both
config and --left-right would mean one of them n
On Thu, 2015-09-03 at 16:10 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > I think I've broken about all of the standalone stuff out, so here's
> > the main enchilada.
> >
> > This series depends on at least the following topics in pu:
> > dt/refs-bisection
> > dt/refs-pseudo
> > dt/re
Jeff King writes:
> Right, it was the second "we know..." that made me worry. It is really
> "we assume". :) Whether it is right according to the spec or not, the
> real world is sometimes more complicated. And given that there is no
> real advantage to changing the sending behavior now, I didn't
I have a profitable business deal for you, for more info contact me asap
Thanks, Tang Lung Peter
--
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
On Thu, 2015-09-03 at 16:08 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > @@ -2827,7 +2831,7 @@ int pack_refs(unsigned int flags)
> > *
> > * The refs in 'refnames' needn't be sorted. `err` must not be NULL.
> > */
> > -static int repack_without_refs(struct string_list *refnames
From: Gabor Bernat
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date %+s command
Signed-off-by: Gabor Bernat
---
I've submitted this first to this list as a feature request, however
in the meantime with the help of Jeff King , Junio C
Ha
Expanding `insteadOf` is a part of ls-remote --url and there is no way
to expand `pushInsteadOf` as well. Add a get-url subcommand to be able
to query both as well as a way to get all configured urls.
Signed-off-by: Ben Boeckel
---
Documentation/git-remote.txt | 10
builtin/remote.c
On Fri, Sep 04, 2015 at 04:02:09PM +0200, Giuseppe Bilotta wrote:
> So, I've at least been able to circumscribe the problem to: server git
> 1.7.0.4, client git 2.5, GIT_WORK_TREE being sent over the ssh
> connection. I'll see if I can find some time to do some proper
> bisecting next week.
That
Junio C Hamano venit, vidit, dixit 03.09.2015 19:13:
> Michael J Gruber writes:
>
>>> Is the design of your independent implementation the same except
>>> that 'o' is used instead of 'x'? Independent implementation does
>>> not make the same design magically better, if that is the case ;-)
>>
>>
On Fri, Sep 04, 2015 at 12:04:38AM +, Rustad, Mark D wrote:
> You can see that git grep missed the line in ixgbe_x550.c that had two hits
> on the string.
>
> This was with git 2.1.0 in Fedora 21. I use git grep a lot and never
> noticed a problem before. I just updated my Fedora 21 system
>
Hello,
On Fri, Sep 4, 2015 at 2:54 PM, Jeff King wrote:
> On Fri, Sep 04, 2015 at 12:52:45PM +0200, Giuseppe Bilotta wrote:
>
>> Notice two things: the messages refer to the worktree updir of the
>> CLIENT machine, and even though it's _completely not obvious_ due to
>> the missing 'remote:' line
On Fri, 04 Sep 2015 15:04:48 +0200,
Jeff King wrote:
>
> On Fri, Sep 04, 2015 at 11:35:57AM +0200, Takashi Iwai wrote:
>
> > > Hmm, is there is any reason to just pass an "in_signal" flag to
> > > wait_for_pager(), to avoid duplicating the logic?
> >
> > Just because wait_for_pager() itself is a
Jacob Keller venit, vidit, dixit 04.09.2015 06:55:
> On Thu, Sep 3, 2015 at 5:04 PM, Rustad, Mark D
> wrote:
>> I just found a case where grep and git grep yield different results. Inside
>> the ixgbe directory of the Linux kernel I did:
>>
>> $ grep enter_lplu *.[ch]
>>
>> And got the following
Hi Junio and other recipients:
Junio, thanks for your response. I think you may have misunderstood my
patch though (or I am misunderstanding your responses), because it
seems we are actually in agreement.
1) My original patch is to make 'git push --porcelain --quiet' not
emit 'Done' when there is
On Thu, Sep 03, 2015 at 12:00:58PM +0200, Johannes Schindelin wrote:
> In short: for users and contributors of Git for Windows, nothing
> changes. Except that Pull Requests and issues may be dealt with more
> swiftly, and that I will actively work on keeping Git for Windows more
> closely in sync
On Fri, Sep 04, 2015 at 11:35:57AM +0200, Takashi Iwai wrote:
> > Hmm, is there is any reason to just pass an "in_signal" flag to
> > wait_for_pager(), to avoid duplicating the logic?
>
> Just because wait_for_pager() itself is an atexit hook that can't take
> an argument, so we'd need to split t
On Fri, Sep 04, 2015 at 12:52:45PM +0200, Giuseppe Bilotta wrote:
> Trying to push any changes with 2.5 resulted in this kind of failure:
>
> user@clientmachine:~/some/git/workdir $ git push
> Counting objects: 6, done.
> Delta compression using up to 8 threads.
> Compressing objects: 100% (5/5),
On Thu, Sep 3, 2015 at 5:00 AM, Johannes Schindelin
wrote:
> Hey all,
>
> yes, it is true: since mid-August I am working for Microsoft. Over a
> year ago, I got into contact with the Visual Studio Online group at
> Microsoft, of which I am now a happy member. A large part of my mission
> is to imp
On Thu, Sep 3, 2015 at 9:57 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> Also, if 'buf' is indeed unconditionally NUL-terminated, then the (sp
>> <= buf + size) check is wasted code since the result of strstr() will
>> always be either NULL or pointing somewhere within the NUL-terminate
[It looks like your reply didn't get through to the mailing list,
presumably because it contained a text/html part.]
On Fri, Sep 04, 2015 at 04:22:04AM -0600, Jesse Hopkins wrote:
> On Sep 4, 2015 1:54 AM, "John Keeping" wrote:
> > When I checkout a tag, "git reflog -1" gives something like:
> >
Hello all,
I'm going to tell a tale of the oddest bug I've ever come across in
Git and aks for suggestions on how we can improve the user experience
in a sensible way.
I've been stymied for days trying to solve the following issue, which
I came across every time I tried to push to a specific mac
On Fri, 04 Sep 2015 11:23:55 +0200,
Jeff King wrote:
>
> On Fri, Sep 04, 2015 at 07:52:21AM +0200, Takashi Iwai wrote:
>
> > -- 8< --
> > From: Takashi Iwai
> > Subject: [PATCH] pager: don't use unsafe functions in signal handlers
> >
> > Since the commit [a3da8821208d: pager: do wait_for_pager
On Fri, Sep 04, 2015 at 07:52:21AM +0200, Takashi Iwai wrote:
> -- 8< --
> From: Takashi Iwai
> Subject: [PATCH] pager: don't use unsafe functions in signal handlers
>
> Since the commit [a3da8821208d: pager: do wait_for_pager on signal
> death], we call wait_for_pager() in the pager's signal ha
On Thu, Sep 03, 2015 at 03:17:18PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Frankly, this feels a bit like a step backwards to me. I am tempted to
> > suggest instead that git start sending the newlines, but I'm not sure
> > it's worth any potential fallout.
>
> I actually think w
On Thu, Sep 03, 2015 at 10:49:36PM +0200, Lars Schneider wrote:
> Do you want to test this feature against a real backend? In that case
> you would need a LFS enabled GitHub account. If you don’t have one,
> maybe _Jeff King_ can help?
You can sign up here:
https://github.com/early_access/git-
Lars Schneider writes:
> > Hi Lars,
> >
> > Lars Schneider writes:
> >
> >> +test_expect_success 'Clone repo containing iso8859-1 encoded paths with
> >> git-p4.pathEncoding' '
> >> +
> >> +test_when_finished cleanup_git &&
> >> +(
> >> +cd "$git" &&
> >> +
On Thu, Sep 03, 2015 at 08:53:16PM -0600, Jesse Hopkins wrote:
> Looking for suggestions on how to determine the tag that was used to
> checkout a git repo to its associated commit, particularly in the case
> where multiple tags might point to the same commit.
>
> I've had a look at git-name-rev a
On 03 Sep 2015, at 23:31, Junio C Hamano wrote:
> Lars Schneider writes:
>
>> In case I agree with a reviewer. What is the more appropriate action?
>> A response like the one above or a new role that includes the change
>> right away? I don’t want to spam the list with lots of tiny changes…
>
Hi Junio,
On 2015-09-03 21:00, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>> I have a couple of fixes lined up for bugs in Git for Windows 2.5.1. Do
>> you plan to release 2.5.2 any time soon? If yes, I would hold off,
>> otherwise I will just do a Git for Windows 2.5.1 (Rel 2).
>
>
70 matches
Mail list logo
