Re: [PATCH] use strbuf_addstr() for adding constant strings to a strbuf, part 2

2016-10-02 Thread René Scharfe
Am 15.09.2016 um 23:39 schrieb Junio C Hamano: > René Scharfe writes: > >> Am 15.09.2016 um 22:01 schrieb Junio C Hamano: >>> René Scharfe writes: >>> Take this for example: - strbuf_addf(>obuf, _("(bad commit)\n")); +

Re: [PATCH] l10n: de.po: translate 260 new messages

2016-10-02 Thread Matthias Rüster
Hi Ralf, many thanks for your translations! I reviewed them and only have some minor comments: > #: bisect.c:967 > -#, fuzzy, c-format > +#, c-format > msgid "%s was both %s and %s\n" > -msgstr "%s folgt sowohl %s als auch %s" > +msgstr "%s war %s als auch %s\n" Maybe keeping the "sowohl"

Re: Setting pager.add=true breaks add --patch

2016-10-02 Thread Anatoly Borodin
Hi Ravi, I've reported this one bug recently: https://public-inbox.org/git/nrmbrl$hsk$1...@blaine.gmane.org/ The developers know about it, but it will require some deeper refactoring. -- Mit freundlichen Grüßen, Anatoly Borodin

[PATCH] l10n: de.po: translate 260 new messages

2016-10-02 Thread Ralf Thielow
Translate 260 new message came from git.pot updates in 9fa976f (l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)) and 5bd166d (l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 783

Re: [PATCH 2/6] sha1_file: always allow relative paths to alternates

2016-10-02 Thread Jeff King
On Sun, Oct 02, 2016 at 11:38:56AM -0400, Jeff King wrote: > On Sun, Oct 02, 2016 at 11:07:39AM +0200, René Scharfe wrote: > > > diff --git a/builtin/count-objects.c b/builtin/count-objects.c > > index ba92919..b2afe36 100644 > > --- a/builtin/count-objects.c > > +++ b/builtin/count-objects.c >

[PATCH] ref-filter: strip format option after a field name only once while parsing

2016-10-02 Thread SZEDER Gábor
When parse_ref_filter_atom() iterates over a list of valid atoms to check that a field name is one of them, it has to strip the optional colon-separated format option suffix that might follow the field name. However, it does so inside the loop, i.e. it performs the exact same stripping over and

Re: [PATCH 2/6] sha1_file: always allow relative paths to alternates

2016-10-02 Thread Jeff King
On Sun, Oct 02, 2016 at 11:07:39AM +0200, René Scharfe wrote: > diff --git a/builtin/count-objects.c b/builtin/count-objects.c > index ba92919..b2afe36 100644 > --- a/builtin/count-objects.c > +++ b/builtin/count-objects.c > @@ -73,6 +73,12 @@ static int count_cruft(const char *basename, const

Re: [PATCH 2/6] sha1_file: always allow relative paths to alternates

2016-10-02 Thread Jeff King
On Sun, Oct 02, 2016 at 11:07:39AM +0200, René Scharfe wrote: > Am 30.09.2016 um 21:36 schrieb Jeff King: > > We adjust the test script here to demonstrate that this now > > works. Unfortunately, we can't demonstrate that the > > duplicate is suppressed, since it has no user-visible > > behavior

Re: [PATCH 0/6] receive-pack: quarantine pushed objects

2016-10-02 Thread Jeff King
On Sun, Oct 02, 2016 at 11:20:59AM +0200, Christian Couder wrote: > On Fri, Sep 30, 2016 at 9:35 PM, Jeff King wrote: > > I've mentioned before on the list that GitHub "quarantines" objects > > while the pre-receive hook runs. Here are the patches to implement > > that. > >

Re: [PATCH] tmp-objdir: mark some file local symbols static

2016-10-02 Thread Jeff King
On Sun, Oct 02, 2016 at 12:07:27AM +0100, Ramsay Jones wrote: > If you need to re-roll your 'jk/quarantine-received-objects' branch, > could you please squash this into the relevant patches. Oops, thanks. Don't know how I missed both of these. > [I also note that tmp_objdir_destroy(), declared

Setting pager.add=true breaks add --patch

2016-10-02 Thread Ravi (Tom) Hale
Given: 1) git version 2.10.0.GIT 2) The following configuration: === [core] pager = less -FRX --tabs=4 [pager] add = true === 3) A patch hunk longer than a screen THEN: less will be invoked as expected. However, upon exiting less, I am dropped

Re;一般贸易退税&東莞/深圳/廣州/中山/香港物流

2016-10-02 Thread Paul Tsang
Dear Sir/Miss 只要贵司拥有一般纳税人资质和能开17%的增值税专用发票,我司便能为贵司做退税; 1.出口退税条件:①真正有生产经营能力的企业而不是空壳企业②需代办出口退税的企业③保证能开增值税专用发票的企业④保证企业开的增值税专用发票的合法,合理而不是虚开增值税专用发票 2.货物出口;工厂须提供产品名称,商品编码,规格,型号,包装方式,单价,总价及装箱单.

Re: [PATCH 0/6] receive-pack: quarantine pushed objects

2016-10-02 Thread Christian Couder
On Fri, Sep 30, 2016 at 9:35 PM, Jeff King wrote: > I've mentioned before on the list that GitHub "quarantines" objects > while the pre-receive hook runs. Here are the patches to implement > that. Great! Thanks for upstreaming these patches! I wonder if the patch you sent in:

Re: [PATCH 2/6] sha1_file: always allow relative paths to alternates

2016-10-02 Thread René Scharfe
Am 30.09.2016 um 21:36 schrieb Jeff King: > We adjust the test script here to demonstrate that this now > works. Unfortunately, we can't demonstrate that the > duplicate is suppressed, since it has no user-visible > behavior (it's just one less place for our object lookups to > go). But you can