{"thread":{"id":"20219","subject":"git-am -p fails with new file","startedAt":"2009-07-24T18:09:30Z","lastAt":"2009-07-24T18:09:30Z","messageCount":1,"participants":["Pierre-Marc Fournier"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"118650","messageId":"4A69F8DA.9060406@polymtl.ca","threadId":"20219","inReplyTo":null,"subject":"git-am -p fails with new file","fromName":"Pierre-Marc Fournier","fromEmail":"pierre-marc.fournier@polymtl.ca","sentAt":"2009-07-24T18:09:30Z","receivedAt":"2009-07-24T18:09:30Z","isPatch":false,"sender":{"key":"pierre-marc.fournier@polymtl.ca","avatar":null},"body":"I have a patch generated with git format-patch. I am trying to apply it\nin a repository that contains only a subdirectory of the original\nrepository.\n\nTherefore, I need to use git-am -p, which fails with the following message.\n\nfatal: git apply: bad git-diff - inconsistent new filename on line 33\n\nIs there a code path missing in parse_git_header() to strip the\ndirectories as requested by -p?\n\nPlease CC me. Thanks.\n\npmf\n"}]}