git - 交互模式下的一些选择在 git 上不起作用

Question

我只是尝试使用提交 checkout 的交互模式

git checkout -p <commit_sha1>

有不同的选择

Apply this hunk to index and worktree [y,n,q,a,d,/,s,e,?]?

然后按 ? 它会显示更多选项

y - apply this hunk to index and worktreen - do not apply this hunk to index and worktreeq - quit; do not apply this hunk nor any of the remaining onesa - apply this hunk and all later hunks in the filed - do not apply this hunk nor any of the later hunks in the fileg - select a hunk to go to/ - search for a hunk matching the given regexj - leave this hunk undecided, see next undecided hunkJ - leave this hunk undecided, see next hunkk - leave this hunk undecided, see previous undecided hunkK - leave this hunk undecided, see previous hunks - split the current hunk into smaller hunkse - manually edit the current hunk? - print help

我实际上尝试了所有的亲戚来未定帅哥，但他们似乎都没有用。选择后，无论我按 j/J/k/K 还是 s，它总是返回同一个文件并再次要求选择。

而所有其他(y/n/q/a/d/.. 等)都有效。

这有什么原因吗？

Answer 1

Apply this hunk to index and worktree [y,n,q,a,d,/,s,e,?]?

git 只给你选择 y,n,q,a,d,/,s,e,?，因为文件的快照只有 1 个 hunk。帮助打印出所有可能可用的选项，但在您的情况下，您无法选择跳过大块。

大块是文件中的一个差异。所以 git 想告诉你的是，那个文件中只有一个 diff。所以你不能跳过它并转到下一个。

例如..如果我创建一个文本文件并将您的问题放入其中，这样我就会得到这个差异

@@ -1,9 +1,28 @@
 I'm just trying the interactive mode with a commit checkout

+    git checkout -p <commit_sha1>
+
 There are different choices available

+    Apply this hunk to index and worktree [y,n,q,a,d,/,s,e,?]?
+
 and pressing ? it shows even more options

+    y - apply this hunk to index and worktree
+    n - do not apply this hunk to index and worktree
+    q - quit; do not apply this hunk nor any of the remaining ones
+    a - apply this hunk and all later hunks in the file
+    d - do not apply this hunk nor any of the later hunks in the file
+    g - select a hunk to go to
+    / - search for a hunk matching the given regex
+    j - leave this hunk undecided, see next undecided hunk
+    J - leave this hunk undecided, see next hunk
+    k - leave this hunk undecided, see previous undecided hunk
+    K - leave this hunk undecided, see previous hunk
+    s - split the current hunk into smaller hunks
+    e - manually edit the current hunk
+    ? - print help
+
 I actually tried all the relatives to undecided hunks, and none of them seem to work. After the choice, no matter if I press j/J/k/K or s it always returns to the same file and as
k again for a choice.

 While all the others (y/n/q/a/d/.. etc.) work.

比起交互式 checkout ，我可以将实际的大块分成较小的大块。

Apply this hunk to index and worktree [y,n,q,a,d,/,s,e,?]? s

之后您可以选择要应用和跳过哪个 block 。

    Split into 3 hunks.
@@ -1,4 +1,6 @@
 I'm just trying the interactive mode with a commit checkout

+    git checkout -p <commit_sha1>
+
 There are different choices available

Apply this hunk to index and worktree [y,n,q,a,d,/,j,J,g,e,?]? j

跳过 (j) 并继续下一个大块。

@@ -3,4 +5,6 @@
 There are different choices available

+    Apply this hunk to index and worktree [y,n,q,a,d,/,s,e,?]?
+
 and pressing ? it shows even more options

Apply this hunk to index and worktree [y,n,q,a,d,/,k,K,j,J,g,e,?]?