diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-04-26 16:51:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 19:27:39 +0900 |
| commit | 6f93d261fa8ca6a84c2e03e20558c0ddca3c05c3 (patch) | |
| tree | 6a79488f5f2f438ff48afc31f08821a2bee589a7 /Documentation/git-format-patch.txt | |
| parent | 83232e38648b51abbcbdb56c94632b6906cc85a6 (diff) | |
| download | git-6f93d261fa8ca6a84c2e03e20558c0ddca3c05c3.tar.xz | |
format-patch: inform user that patch-id generation is unstable
I tried out 'git format-patch --base' with a set of commits that
modifies more than one file. It turns out that the way this command is
implemented it actually uses the unstable version of patch-id instead of
the stable version that's documented. When I tried to modify the
existing test to use 'git patch-id --stable' vs. 'git patch-id
--unstable' I found that it didn't matter, the test still passed.
Let's expand on the test here so it is a little more complicated and
then use that to show that the patch-id generation is actually unstable
vs. stable. Update the documentation as well.
Cc: Xiaolong Ye <xiaolong.ye@intel.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-format-patch.txt')
| -rw-r--r-- | Documentation/git-format-patch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 1af85d404f..e8cc792e7f 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -583,7 +583,7 @@ of 'base commit' in topological order before the patches can be applied. The 'base commit' is shown as "base-commit: " followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as "prerequisite-patch-id: " followed by the 40-hex 'patch id', which can -be obtained by passing the patch through the `git patch-id --stable` +be obtained by passing the patch through the `git patch-id --unstable` command. Imagine that on top of the public commit P, you applied well-known |