delta/git.git/t/t5100, branch ss/userdiff-update-csharp-java

Merge branch 'jc/maint-mailinfo-mime-attr'

2012-09-25T17:39:56+00:00

When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.

* jc/maint-mailinfo-mime-attr:
  mailinfo: do not concatenate charset= attribute values from mime headers

mailinfo: do not concatenate charset= attribute values from mime headers

2012-09-17T22:24:52+00:00

"Content-type: text/plain; charset=UTF-8" header should not appear
twice in the input, but it is always better to gracefully deal with
such a case.  The current code concatenates the value to the values
we have seen previously, producing nonsense such as "utf8UTF-8".

Instead of concatenating, forget the previous value and use the last
value we see.

Signed-off-by: Junio C Hamano

diff --stat: use less columns for change counts

2012-04-30T21:17:26+00:00

Number of columns required for change counts is now computed based on
the maximum number of changed lines instead of being fixed. This means
that usually a few more columns will be available for the filenames
and the graph.

The graph width logic is also modified to include enough space for
"Bin XXX -> YYY bytes".

If changes to binary files are mixed with changes to text files,
change counts are padded to take at least three columns. And the other
way around, if change counts require more than three columns, then
"Bin"s are padded to align with the change count. This way, the +-
part starts in the same column as "XXX -> YYY" part for binary files.
This makes the graph easier to parse visually thanks to the empty
column. This mimics the layout of diff --stat before this change.

Tests and the tutorial are updated to reflect the new --stat output.
This means either the removal of extra padding and/or the addition of
up to three extra characters to truncated filenames. One test is added
to check the graph alignment when a binary file change and text file
change of more than 999 lines are committed together.

Signed-off-by: Zbigniew Jędrzejewski-Szmek 
Signed-off-by: Junio C Hamano

mailinfo: do not strip leading spaces even for a header line

2010-02-20T05:55:33+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ls/maint-mailinfo-no-inbody'

2009-11-23T00:40:26+00:00

* ls/maint-mailinfo-no-inbody:
  git am/mailinfo: Don't look at in-body headers when rebasing

git am/mailinfo: Don't look at in-body headers when rebasing

2009-11-21T07:14:02+00:00

When we are rebasing we know that the header lines in the
patch are good and that we don't need to pick up any headers
from the body of the patch.

This makes it possible to rebase commits whose commit message
start with "From" or "Date".

Test vectors by Jeff King.

Signed-off-by: Lukas Sandström 
Signed-off-by: Junio C Hamano

Mark files in t/t5100 as UTF-8

2009-10-21T18:27:50+00:00

This enables gitk to show the patch text with correct glyphs if the locale
is not UTF-8.

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

Remove a left-over file from t/t5100

2009-10-21T18:27:48+00:00

This mbox file must have been added by accident in e9fe804 (git-mailinfo:
Fix getting the subject from the in-body [PATCH] line, 2008-07-14).

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

am/mailinfo: Disable scissors processing by default

2009-08-27T05:22:22+00:00

You can enable it by giving --scissors to "git am".

Signed-off-by: Junio C Hamano

Teach mailinfo to ignore everything before -- >8 -- mark

2009-08-27T05:21:32+00:00

This teaches mailinfo the scissors -- >8 -- mark; the command ignores
everything before it in the message body.

For lefties among us, we also support -- 8< -- ;-)

Signed-off-by: Junio C Hamano