git rebase命令坏了 - 输出错误

时间:2017-07-18 07:27:57

标签: git rebase

出于某种原因git rebase -i <SHA>停止为我工作。

我一直在使用git-rebase来清理我的功能分支,然后很快就合并了很长一段时间,但是截至今天我只在交互式编辑器弹出窗口中输出错误的输出...

使用示例存储库:

git clone git@github.com:philsquared/Catch.git
cd Catch/
git rebase -i HEAD~5

我的git-editor弹出以下错误的内容:

# Note that empty commits are commented out
ebase will be aborted.
#
edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.

请注意,给定的历史记录框架中没有空提交(HEAD~5)。

我在Manjaro / Arch-Linux上使用git 2.13.2,这是我迄今为止尝试过的,但没有取得任何成功:

  • 从头开始重新安装git(pacman -Rdd git; pacman -Scc; pacman -S git
  • 重新启动系统
  • 使用不同的存储库进行测试
  • 删除/重命名我的〜/ .gitconfig
  • 以不同用户身份执行命令
  • 将区域设置从de_DE.UTF-8更改为en_US.UTF-8
  • 使用不同的编辑器(Atom,Nano,Kate)

我在这里完全失败了......

更新

再次开始工作!

我能够找到与内核版本4.12.1相关的罪魁祸首(在manjaro / arch-linux上)。这个问题似乎只发生在使用这个内核版本运行时,内核4.11.10一切似乎都很好,并按预期工作,例如。对于上面的例子,我得到:

pick 3083de9 Fix typo in README
pick 8d380a7 added 'args' argument parser library
pick a53ea30 Eliminate some work when results won't be reported.
pick 106d7e2 Initialize JunitReporter::unexpectedExceptions in constructor
pick 8ebe94c Added NOLINT annotations to selectively suppress clang_tidy warnings

# Rebase 431e8d0..8ebe94c onto 431e8d0 (5 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

这可能是内核错误还是只有4.12.1版本的特定系统/配置问题?

在解读此问题时可能有用的其他信息:

  • 操作系统:Linux
  • 内核4.12.1-1
  • 发行:Manjaro
  • GIT:2.13.2
  • 根文件系统:LUKS-Partition上的BTRFS

0 个答案:

没有答案