Brandon Casey wrote:
> Let's detect "(cherry picked from...)" as part of the footer so that we
> will produce this:
>
>Signed-off-by: A U Thor
>(cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709)
>Signed-off-by: C O Mmitter
>
> instead of this:
>
>Signed-off-by: A U Tho
David Aguilar writes:
> On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano wrote:
>> I think our works crossed, while I was tweaking the previous series
>> to push out as part of 'pu' you were already rerolling. Could you
>> compare this series with what I pushed out and see if anything you
>> mis
Brandon Casey wrote:
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -20,6 +20,67 @@
[...]
> static int has_conforming_footer(struct strbuf *sb, int ignore_footer)
[...]
> + /* require at least one blank line */
> + if (!last_char_was_nl || buf[i] != '\n')
> + return 0;
Makes se
On Sun, Jan 27, 2013 at 6:27 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
>> On Sun, Jan 27, 2013 at 6:08 PM, Junio C Hamano wrote:
>>> I think our works crossed, while I was tweaking the previous series
>>> to push out as part of 'pu' you were already rerolling. Could you
>>> compare th
Jonathan Nieder wrote:
> Here's the tweak I suggested last time. I think its behavior is
> slightly better in the "ends with incomplete line" case because it
> limits the characters examined by is_rfc2822_line() and
> is_cherry_picked_from_line() not to include buf[len] (which would
> presumably
David Aguilar writes:
> Okay, cool, so no need to reroll, ya?
It was more like "please don't switch to incremental yet"; I tweaked
the mode_ok in your v2 and pushed out the result on 'pu' again.
There may later be comments from others that make us realize some
patches need to be rerolled, but n
Brandon Casey wrote:
> Teach append_signoff how to detect a duplicate s-o-b in the commit footer.
This replaces the previous (slightly broken) logic that checked
whether the sign-off to be appended would be redundant and puts the
fixed logic further down the call-chain next to the rest of footer
Brandon Casey wrote:
> --- a/sequencer.c
> +++ b/sequencer.c
[...]
> @@ -1096,10 +1117,16 @@ void append_signoff(struct strbuf *msgbuf, int
> ignore_footer)
> strbuf_addch(&sob, '\n');
> for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1]
> != '\n'; i--)
>
Brandon Casey wrote:
> Teach append_signoff to detect whether a blank line exists at the position
> that the signed-off-by line will be added, and avoid adding an additional
> one if one already exists. This is necessary to allow format-patch to add a
> s-o-b to a patch with no commit message wit
Brandon Casey wrote:
[...]
> --- a/t/t4014-format-patch.sh
> +++ b/t/t4014-format-patch.sh
> @@ -1021,4 +1021,246 @@ test_expect_success 'cover letter using branch
> description (6)' '
> grep hello actual >/dev/null
> '
>
> +append_signoff()
> +{
> + C=`git commit-tree HEAD^^{tree} -
Brandon Casey wrote:
> From: Nguyễn Thái Ngọc Duy
>
> This is a preparation step for merging with append_signoff from
> sequencer.c
Avoids a small unfreed allocation, too. Neat.
Reviewed-by: Jonathan Nieder
(On the other hand, this means more malloc churn when running
"format-patch -s" on a
Brandon Casey wrote:
> --- a/log-tree.c
> +++ b/log-tree.c
[...]
> @@ -208,94 +207,6 @@ void show_decorations(struct rev_info *opt, struct
> commit *commit)
> putchar(')');
> }
>
> -/*
> - * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
> - * Signed-off-by: and Acked-by: l
Brandon Casey wrote:
> Round 3.
Thanks for a pleasant read. My only remaining observations are
cosmetic, except for a portability question in Duy's test script, a
small behavior change when the commit message ends with an
RFC2822-style header with no trailing newline and the possibility of
tight
รู้เท่าทันกับสถานการณ์ใต้
ต้องเรียกว่า“ยอม”กับการแผนการของกลุ่มก่อเหตุรุนแรงที่พยายามทำให้คนไทยพุทธกับมุสลิมแตกแยก
เข่นฆ่าล้างแค้นเนื่องจากเข้าใจผิด
ซึ่งถ้าหากทั้งสองฝ่ายหลงกลและกระทำการให้เป็นไปตามแผน
ที่วางไว้จะกลายเป็นการ ล้างแค้นที่ไม่มีวันสิ้นสุด
สุดท้ายจังหวัดชายแดนภาคใต
I'm working on an hg remote helper that uses git notes for the sha1
revision, so that git users can more easily refer to specific commits
when communicating with hg users. Since there may be multiple
concurrent fast-import streams, I write the notes to a private ref
(refs/notes/hg-REMOTE), to be m
On Sun, Jan 27, 2013 at 6:51 PM, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
>
>> Here's the tweak I suggested last time. I think its behavior is
>> slightly better in the "ends with incomplete line" case because it
>> limits the characters examined by is_rfc2822_line() and
>> is_cherry_picke
Jonathan Nieder writes:
> Brandon Casey wrote:
>
> [...]
>> --- a/t/t4014-format-patch.sh
>> +++ b/t/t4014-format-patch.sh
>> @@ -1021,4 +1021,246 @@ test_expect_success 'cover letter using branch
>> description (6)' '
>> grep hello actual >/dev/null
>> '
>>
>> +append_signoff()
>> +{
>>
On Sat, Jan 26, 2013 at 2:00 AM, Junio C Hamano wrote:
> This is not a tangent, but if you want to go this "forbid making our
> repository depend on objects we do not have but we know about after
> we peek submodule odb" route [*1*], write_sha1_file() needs to be
> told about has_sha1_file_proper(
Jonathan Nieder writes:
> Brandon Casey wrote:
>
>> Round 3.
>
> Thanks for a pleasant read. My only remaining observations are
> cosmetic, except for a portability question in Duy's test script, a
> small behavior change when the commit message ends with an
> RFC2822-style header with no traili
Junio C Hamano writes:
>> Is "grep -n" portable? I didn't find any uses of it elsewhere in the
>> testsuite.
>
> Yes, "-n" is in POSIX. Even though we use it ourselves, "git grep"
> supports it, too.
Ehh even though we *DONT* use it ourselves, ... that is.
I do not think we mind, if its use h
Duy Nguyen writes:
> On Sat, Jan 26, 2013 at 2:00 AM, Junio C Hamano wrote:
>> This is not a tangent, but if you want to go this "forbid making our
>> repository depend on objects we do not have but we know about after
>> we peek submodule odb" route [*1*], write_sha1_file() needs to be
>> told
On Mon, Jan 28, 2013 at 12:54 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sat, Jan 26, 2013 at 2:00 AM, Junio C Hamano wrote:
>>> This is not a tangent, but if you want to go this "forbid making our
>>> repository depend on objects we do not have but we know about after
>>> we peek su
Duy Nguyen writes:
>>> Another thing needs to be done for this to work. The current reading
>>
>> For *what* to work???
>
> The "forbid making our repository depend on objects we do not have but
> we know about afterwe peek submodule odb"
With your "when our object database is contaminated, chec
Translate 11 new messages came from git.pot update
in 46bc403 (l10n: Update git.pot (11 new, 7 removed
messages)).
Signed-off-by: Ralf Thielow
---
po/de.po | 37 ++---
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/po/de.po b/po/de.po
index 3779f4
On Mon, Jan 28, 2013 at 12:48 PM, Duy Nguyen wrote:
> Regardless the submodule odb issue, I think we should prefer
> reading local loose objects over alternate packed ones.
I think I went from one problem to another and did not make it clear.
The reason behind this preference is security. With "a
Duy Nguyen writes:
> On Mon, Jan 28, 2013 at 12:48 PM, Duy Nguyen wrote:
>> Regardless the submodule odb issue, I think we should prefer
>> reading local loose objects over alternate packed ones.
>
> I think I went from one problem to another and did not make it clear.
> The reason behind this p
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
As usual, this cycle is expected to last for 8 to 10 weeks, with a
preview -rc0 sometime in the middle of next month.
You can find the changes
On Mon, Jan 28, 2013 at 1:36 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Mon, Jan 28, 2013 at 12:48 PM, Duy Nguyen wrote:
>>> Regardless the submodule odb issue, I think we should prefer
>>> reading local loose objects over alternate packed ones.
>>
>> I think I went from one problem
On Sun, Jan 27, 2013 at 8:04 PM, Junio C Hamano wrote:
> Lars Hjemli writes:
>
>> The command also honours the option '--clean' which restricts the set of
>> repos to those which '--dirty' would skip, and '-x' which is used to
>> execute non-git commands.
>
> It might make sense to internally use
101 - 129 of 129 matches
Mail list logo
