apply --reject: count hunks starting from 1, not 0
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a2bf404e28
commit
0e9ee32358
@ -2313,7 +2313,7 @@ static int write_out_one_reject(struct patch *patch)
|
|||||||
*/
|
*/
|
||||||
fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
|
fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
|
||||||
patch->new_name, patch->new_name);
|
patch->new_name, patch->new_name);
|
||||||
for (cnt = 0, frag = patch->fragments;
|
for (cnt = 1, frag = patch->fragments;
|
||||||
frag;
|
frag;
|
||||||
cnt++, frag = frag->next) {
|
cnt++, frag = frag->next) {
|
||||||
if (!frag->rejected) {
|
if (!frag->rejected) {
|
||||||
|
Loading…
Reference in New Issue
Block a user