diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-16 14:03:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:36:50 -0700 |
| commit | ccf998b297c6d04053eaa9d61e9cb4187bccd0a9 (patch) | |
| tree | 79f45bde13d5b2c06282e7f1328cb5fc13fd23e6 /git-pull.sh | |
| parent | apply: split load_preimage() helper function out (diff) | |
| download | tgif-ccf998b297c6d04053eaa9d61e9cb4187bccd0a9.tar.xz | |
apply: refactor "previous patch" logic
The code to grab the result of application of a previous patch in the
input was mixed with error message generation for a case where a later
patch tries to modify contents of a path that has been removed.
The same code is duplicated elsewhere in the code. Introduce a helper
to clarify what is going on.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions