Applying a patch with a diff header in its commit message

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

I have a patch at $DAYJOB that contains a diff header ("diff --git 
a/...") in its commit message, and unfortunately it is not indented. So 
naturally, git-am trips up and thinks it is the start of the main diff 
and tries to apply the diff starting there. It does not apply and the 
patch is rejected as being corrupt.

I know one option for me is to manually edit the patch and indent the 
diff header. But I would like to avoid that if possible. Is there any 
way to apply that patch as-is? Is it possible to tell git-am where to 
start looking for the diff?

-- 
Regards,
Pratyush Yadav



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux