diff options
| author | Lukas Sandström <luksan@gmail.com> | 2009-11-20 17:12:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:14:02 -0800 |
| commit | d25e51596be9271ad833805a3d6f9012dc24ee79 (patch) | |
| tree | d0f40af3fc5da0c97602a2def6cdeeec10e71318 /t/t5100/patch0015 | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-d25e51596be9271ad833805a3d6f9012dc24ee79.tar.gz git-d25e51596be9271ad833805a3d6f9012dc24ee79.tar.xz | |
git am/mailinfo: Don't look at in-body headers when rebasing
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 <luksan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/patch0015')
| -rw-r--r-- | t/t5100/patch0015 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t5100/patch0015 b/t/t5100/patch0015 new file mode 100644 index 000000000..ad6484887 --- /dev/null +++ b/t/t5100/patch0015 @@ -0,0 +1,8 @@ +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + |