Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Next revisionBoth sides next revision | ||
| zh:submitting-patches [2020/03/02 17:13] – [8. 不要灰心,重新提交] superice | zh:submitting-patches [2020/03/08 15:52] – [10. 签署工作] superice | ||
|---|---|---|---|
| Line 205: | Line 205: | ||
| ==== 10. 签署工作 ===== | ==== 10. 签署工作 ===== | ||
| - | To provide tracking of who did what, we use a " | ||
| - | The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as an open-source patch. The rules are pretty simple: if you can certify the below: | + | 为了跟踪谁做了什么,我们对正在通过电子邮件发送的补丁程序使用“签署”程序。 |
| + | |||
| + | 补丁说明末尾的签名很简单,它证明您写了它,或者有权将它作为开放源代码补丁进行传递。 规则非常简单:如果您可以证明以下内容: | ||
| < | < | ||
| Line 237: | Line 238: | ||
| </ | </ | ||
| - | then you just add a line saying | + | 然后你只需加上一句话 |
| <code bash> | <code bash> | ||
| Line 243: | Line 244: | ||
| </ | </ | ||
| - | using your real name (no pseudonyms or anonymous contributions.) | + | 使用您的真实姓名(没有化名或匿名。) |
| - | If you are a package or target maintainer, sometimes you need to slightly modify patches you receive in order to merge them, because the code is not exactly the same in your tree and the submitters' | + | 如果你是一个包或目标维护者,有时你需要稍微修改你接收到的补丁以便合并它们,因为代码在你的树和提交者中不是完全相同的。如果你严格遵守规则,你应该向提交人请求重新授权,但这完全是浪费时间和精力。规则(B)允许您调整代码,但是更改提交人的代码并使他支持您的bug是非常不礼貌的。为了解决这个问题,建议您在最后一个签名的头和您的头之间添加一行,说明您的更改的性质。虽然没有什么强制性的,这似乎是准备描述与您的邮件和/或名称,所有包围在方括号中,是显而易见的,足以使你清楚,你负责的最后一分钟的变化。例子: |
| <code bash> | <code bash> | ||
| Line 253: | Line 254: | ||
| </ | </ | ||
| - | This practice is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author' | + | 如果你保持一个稳定的分支,并希望同时信任作者,跟踪更改,合并修复,并保护提交者不受投诉,这种做法尤其有用。请注意,在任何情况下,您都不能更改作者的身份(从报头),因为它是在变更日志中出现的身份。 |
| - | Special note to back-porters: | + | 向后移植者的特别注意:在提交消息的顶部(仅在主题行之后)插入补丁来源的指示,以方便跟踪,这似乎是一种常见且有用的做法。 例如: |
| <code bash> | <code bash> | ||
| Line 263: | Line 264: | ||
| </ | </ | ||
| - | Whatever the format, this information provides valuable help to people tracking your trees, and to people trying to trouble-shoot bugs in your tree. | + | 无论采用哪种格式,此信息都可以为跟踪您的树的人们以及试图对树中的错误进行故障排除的人们提供宝贵的帮助。 |
| - | For the more convenient developers, | + | 对于更方便的开发人员,git可以自动添加签名: |
| <code bash> | <code bash> | ||