[ 
https://issues.apache.org/jira/browse/HBASE-11937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14130405#comment-14130405
 ] 

Sean Busbey commented on HBASE-11937:
-------------------------------------

that patch was created with {{--no-prefix}}. you can tell because the line for 
{{diff --git}} has paths that don't start with "a/hbase-server/..." and 
"b/hbase-server/..."

For those patches you have to run {{git apply -p0 --check}} (and apply/am 
similarly need -p0).

> Update patch submission guidelines to stop using --no-prefix
> ------------------------------------------------------------
>
>                 Key: HBASE-11937
>                 URL: https://issues.apache.org/jira/browse/HBASE-11937
>             Project: HBase
>          Issue Type: Improvement
>          Components: documentation
>            Reporter: Sean Busbey
>            Priority: Minor
>
> Right now the submission guidelines include the use of --no-prefix in the 
> Methods to Create Patches section:
> {quote}
> Git
> git format-patch is preferred because it preserves commit messages. Use git 
> squash first, to combine smaller commits into a single larger one.
> * git format-patch --no-prefix origin/master --stdout > HBASE-XXXX.patch
> * git diff --no-prefix origin/master > HBASE-XXXX.patch
> {quote}
> The use of --no-prefix means that users of {{git apply}} and {{git am}} have 
> to know to specify {{-p0}} and (which strips 0 levels of prefix). Both of 
> those tools default to stripping the 1 level of prefix git makes by default.
> The guide for HBase committers section on reviewing doesn't give any 
> suggestions on how to apply patches from contributors. It should probably 
> give examples for using {{git am}} and {{git apply}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Reply via email to