diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-19 09:07:57 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-19 09:07:57 +0400 |
| commit | beace29a0437068a36bc5963d905fac482724196 (patch) | |
| tree | ab6c9dbb2e883e33e513b762cb1e9850b206b7f8 /git-am.sh | |
| parent | d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (diff) | |
| parent | 0e8341f29d6541f661cc52f27f96877c0fd469c2 (diff) | |
Merge branch 'db/am-skip-blank-at-the-beginning'
* db/am-skip-blank-at-the-beginning:
am: ignore leading whitespace before patch
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -197,10 +197,15 @@ check_patch_format () { return 0 fi - # otherwise, check the first few lines of the first patch to try - # to detect its format + # otherwise, check the first few non-blank lines of the first + # patch to try to detect its format { - read l1 + # Start from first line containing non-whitespace + l1= + while test -z "$l1" + do + read l1 + done read l2 read l3 case "$l1" in |