mirror of
https://github.com/sheumann/hush.git
synced 2025-01-22 03:30:37 +00:00
diff: comment - explain what happens when hunk fails to apply
This commit is contained in:
parent
f7583d89b0
commit
0a10da29a7
@ -15,9 +15,8 @@
|
|||||||
*
|
*
|
||||||
* Issues
|
* Issues
|
||||||
* - Non-interactive
|
* - Non-interactive
|
||||||
* - Patches must apply cleanly or the hunk will fail.
|
* - Patches must apply cleanly or patch (not just one hunk) will fail.
|
||||||
* - Reject file isnt saved
|
* - Reject file isnt saved
|
||||||
* -
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
@ -214,6 +213,8 @@ int patch_main(int argc, char **argv)
|
|||||||
bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
|
bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
|
||||||
hunk_error++;
|
hunk_error++;
|
||||||
free(patch_line);
|
free(patch_line);
|
||||||
|
/* Probably need to find next hunk, etc... */
|
||||||
|
/* but for now we just bail out */
|
||||||
patch_line = NULL;
|
patch_line = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user