| commit | d75bb73bcf2ecce38c147980aac0cbc27a6b838a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Aug 2015 22:39:01 +0000 (31 15:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Aug 2015 22:39:03 +0000 (31 15:39 -0700) | ||
| tree | 915571f195467d0a8b441455a94d6dca3c95f697 | treesnapshot (tar.gz zip) |
| parent | 2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae | commitdiff |
| parent | 1f76a10b2d72245332ac41bd79249cb82f3946f0 | commitdiff |
Merge branch 'jc/am-state-fix'
Recent reimplementation of "git am" changed the format of state
files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
primarily because write_file() API was cumbersome to use and it was
easy to mistakenly make text files with incomplete lines. Update
write_file() interface to make it harder to misuse.
* jc/am-state-fix:
write_file(): drop caller-supplied LF from calls to create a one-liner file
write_file_v(): do not leave incomplete line at the end
write_file(): drop "fatal" parameter
builtin/am: make sure state files are text
builtin/am: introduce write_state_*() helper functions
Recent reimplementation of "git am" changed the format of state
files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
primarily because write_file() API was cumbersome to use and it was
easy to mistakenly make text files with incomplete lines. Update
write_file() interface to make it harder to misuse.
* jc/am-state-fix:
write_file(): drop caller-supplied LF from calls to create a one-liner file
write_file_v(): do not leave incomplete line at the end
write_file(): drop "fatal" parameter
builtin/am: make sure state files are text
builtin/am: introduce write_state_*() helper functions
| builtin/am.c | diff1 | diff2 | blobhistory |
| builtin/worktree.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| submodule.c | diff1 | diff2 | blobhistory |