git 头指针分离于 baf67ff 解决方法

本文深入探讨了Git中分离头指针(detached HEAD)的概念,解释了在特定操作下,如checkout具体commit,如何导致HEAD与分支指针分离,以及这种状态下进行提交可能引发的问题。文章还提供了实用的解决方案,帮助读者理解并解决分离头指针带来的挑战。

摘要生成于 C知道 ,由 DeepSeek-R1 满血版支持, 前往体验 >

分离头指针(detached HEAD)

通常,我们工作在某一个分支上,比如 master 分支。这个时候 master 指针和 HEAD 指针是一起前进的,每做一次提交,这两个指针就会一起向前挪一步。但是在某种情况下(例如 checkout 了某个具体的 commit),master 指针 和 HEAD 指针这种「绑定」的状态就被打破了,变成了分离头指针状态。我那天遇到的情况是,master 和 HEAD 指针看上去指在同一个 commit 上,但其实已经处在分离头指针状态。当我在此时又做了一次新的提交时,HEAD 指针跑到 master 指针前面去了。如果我直接检出 master 分支,HEAD 指针就会回退一格到 master 指针的位置,而最新的那次提交就变成了孤立的提交,没有任何分支能追踪到它,刚才的活白干了。

# 强制将 master 分支指向当前头指针的位置
$ git branch -f master HEAD
# 检出 master 分支
$ git checkout master

参考:https://www.jianshu.com/p/91a0f8feb45d

将以下内容写成优快云的Markdown格式笔记:--- ![image.png](https://tc-cdn.flowus.cn/oss/d8dbb947-c4ec-401a-ad8c-f966c0e0a210/image.png?time=1742033700&token=170c1f4d4c4abf73067ed4ceb7da99e81600c23783cf882c4853aab6032f6943&role=free) # 1.基础知识 ## 四个区域 - 工作区(Working Directory):你在电脑里能实际看到的目录。 - 暂存区(Stage/Index):用来临时存放未提交的内容,一般在.git目录下的index中。 - 本地仓库(Repository):Git 在本地的版本库,仓库信息存储在.git这个隐藏目录中。 - 远程仓库(Remote Repository):托管在远程服务器上的仓库。常见有GitHub,GitLab,Gitee。 ## 文件状态 - 已修改(Modified):修改了但是没有保存到暂存区的文件。 - 已暂存(Staged):修改后已经保存到暂存区的文件。 - 已提交(Committed):把暂存区的文件提交到本地仓库后的状态。 ![image.png](https://tc-cdn.flowus.cn/oss/665035d9-e2b6-43ab-b8d1-25bcd2bd8f6a/image.png?time=1742033700&token=3f71866dc50f10846de691c4c4b6f143cd8b1eefd2e36099449db8867ec2c981&role=free) ![image.png](https://tc-cdn.flowus.cn/oss/1b24ba52-2c85-4f57-ba7f-91701f7b5d57/image.png?time=1742033700&token=9637c82180cecae61fcb2f1b597b4c597f8847c2e3a0bdcce4f8ff8de2fb929c&role=free) ## 基本概念 - main/master: 默认主分支 - origin: 默认远程仓库 - HEAD: 指向当前分支的指针 - HEAD^: 上一个版本 - HEAD~: 上四个版本 ## 特殊文件 - .git: Git仓库的元数据和对象数据库 - .gitignore: 忽略文件,不需要提交到仓库的文件 - .gitattributes: 指向当前分支的指针 - .gitkeep: 使空目录被提交到仓库 - .gitmodules: 记录子模块的信息 - .gitconfig: 记录仓库的配置信息 ## GitFlow - 主分支(master/main):代表项目的稳定版本。 - 开发分支(develop):用于日常开发。 - 功能分支(feature):用于开发单独的功能或特性。 - 发布分支(release):用于准备项目发布。 - 热修复分支(hotfix):用于修复主分支上的紧急问题。 ![image.png](https://tc-cdn.flowus.cn/oss/ac4e7213-49b5-4385-9baf-b42d71c01c09/image.png?time=1742033700&token=beeb5ca87548a76951e33beb1cfed599af5a0a06b9bff9d7f3055989f28a9524&role=free) # 2.CMD ## 初始化设置 - 配置用户名:`git config --global user.name "Your Name"` - 配置邮箱:`git config --global user.email "[mail@example.com](mailto:mail@example.com)"` - 存储配置:`git config --global credential.helper store` ## 创建仓库 - 新建本地仓库:`git init <project-name>` - (省略`project-name`则在当前目录创建) - 克隆远程仓库:`git clone <url>` ## 添加与提交 - 添加文件到暂存区:`git add <file>` - (`git add .` 表示添加所有文件到暂存区) - 提交所有暂存区的文件到本地仓库:`git commit -m "message"` - 提交所有已修改的
03-16
crash_arm64> bt -f PID: 2271 TASK: ffffff80d9aeb900 CPU: 0 COMMAND: “malloc-multi-th” #0 [ffffffc013b5b7e0] sysdump_panic_event.5378ce4d7e6c0733799d786b95ea2b3a at ffffffc00913b724 ffffffc013b5b7e0: ffffffc013b5b820 ffffffc00821e0fc ffffffc013b5b7f0: ffffffc00ac43830 ffffffc00985c040 ffffffc013b5b800: ffffffc00985c170 ffffffc00abbb640 ffffffc013b5b810: 0000000000000000 ffffffc00aecb229 #1 [ffffffc013b5b820] atomic_notifier_call_chain at ffffffc00821e0f8 ffffffc013b5b820: ffffffc013b5b8f0 ffffffc0081deaa0 ffffffc013b5b830: ffffffc00ae045c0 2edcd99c2d6f1f00 ffffffc013b5b840: ffffffc00848ee10 ffffffc013b5b984 ffffffc013b5b850: 0000000000000000 0000000000000000 ffffffc013b5b860: ffffffc00aecb229 ffffffc00a45f808 ffffffc013b5b870: b13f8fd5464ff906 ffffffc00a2e1e43 ffffffc013b5b880: fffffffffffffffc ffffff8081179e00 ffffffc013b5b890: ffffffc00f531410 ffffff8081179e8c ffffffc013b5b8a0: 9945ada2df32d1cf ec87a19b0bc90485 ffffffc013b5b8b0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8c0: 0000000000000000 00000000ffffffc8 ffffffc013b5b8d0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8e0: 0000000000000000 00000000ffffffc8 #2 [ffffffc013b5b8f0] panic at ffffffc0081dea9c ffffffc013b5b8f0: ffffffc013b5b9a0 ffffffc00814bed8 ffffffc013b5b900: ffffff8088522d98 00000000604003c5 ffffffc013b5b910: ffffffc00ae04650 ffffffc00ae045c0 ffffffc013b5b920: ffffffc00848ee10 ffffffc013b5b984 – MORE – forward: , or j backward: b or k quit: q…skipping… PID: 2271 TASK: ffffff80d9aeb900 CPU: 0 COMMAND: “malloc-multi-th” #0 [ffffffc013b5b7e0] sysdump_panic_event.5378ce4d7e6c0733799d786b95ea2b3a at ffffffc00913b724 ffffffc013b5b7e0: ffffffc013b5b820 ffffffc00821e0fc ffffffc013b5b7f0: ffffffc00ac43830 ffffffc00985c040 ffffffc013b5b800: ffffffc00985c170 ffffffc00abbb640 ffffffc013b5b810: 0000000000000000 ffffffc00aecb229 #1 [ffffffc013b5b820] atomic_notifier_call_chain at ffffffc00821e0f8 ffffffc013b5b820: ffffffc013b5b8f0 ffffffc0081deaa0 ffffffc013b5b830: ffffffc00ae045c0 2edcd99c2d6f1f00 ffffffc013b5b840: ffffffc00848ee10 ffffffc013b5b984 ffffffc013b5b850: 0000000000000000 0000000000000000 ffffffc013b5b860: ffffffc00aecb229 ffffffc00a45f808 ffffffc013b5b870: b13f8fd5464ff906 ffffffc00a2e1e43 ffffffc013b5b880: fffffffffffffffc ffffff8081179e00 ffffffc013b5b890: ffffffc00f531410 ffffff8081179e8c ffffffc013b5b8a0: 9945ada2df32d1cf ec87a19b0bc90485 ffffffc013b5b8b0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8c0: 0000000000000000 00000000ffffffc8 ffffffc013b5b8d0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8e0: 0000000000000000 00000000ffffffc8 #2 [ffffffc013b5b8f0] panic at ffffffc0081dea9c ffffffc013b5b8f0: ffffffc013b5b9a0 ffffffc00814bed8 ffffffc013b5b900: ffffff8088522d98 00000000604003c5 ffffffc013b5b910: ffffffc00ae04650 ffffffc00ae045c0 ffffffc013b5b920: ffffffc00848ee10 ffffffc013b5b984 ffffffc013b5b930: 0000000000000000 ffffffc013b5bac0 ffffffc013b5b940: 00000000000003c0 ffffffc00a2e1e43 ffffffc013b5b950: ffffffc013b5b960 d42100000913aac4 ffffffc013b5b960: 6431383230303439 6533303331616120 ffffffc013b5b970: 6566666635332061 6666663731203034 ffffffc013b5b980: 3234642820393464 0020293030303031 ffffffc013b5b990: 0000000000000000 2edcd99c2d6f1f00 #3 [ffffffc013b5b9a0] die at ffffffc00814bed4 ffffffc013b5b9a0: ffffffc013b5b9e0 ffffffc00814d5b8 ffffffc013b5b9b0: 0000000000000006 ffffffc00983c470 ffffffc013b5b9c0: 0000007f3063c880 ffffffc00848ee10 ffffffc013b5b9d0: ffffffc013b5bac0 ffffffc013b5bac0 #4 [ffffffc013b5b9e0] bug_handler.b1e4d5a5803b26da5893578763b7bc37 at ffffffc00814d5b4 ffffffc013b5b9e0: ffffffc013b5ba10 ffffffc008139fc0 – MORE – forward: , or j backward: b or k quit: q PID: 2271 TASK: ffffff80d9aeb900 CPU: 0 COMMAND: “malloc-multi-th” #0 [ffffffc013b5b7e0] sysdump_panic_event.5378ce4d7e6c0733799d786b95ea2b3a at ffffffc00913b724 ffffffc013b5b7e0: ffffffc013b5b820 ffffffc00821e0fc ffffffc013b5b7f0: ffffffc00ac43830 ffffffc00985c040 ffffffc013b5b800: ffffffc00985c170 ffffffc00abbb640 ffffffc013b5b810: 0000000000000000 ffffffc00aecb229 #1 [ffffffc013b5b820] atomic_notifier_call_chain at ffffffc00821e0f8 ffffffc013b5b820: ffffffc013b5b8f0 ffffffc0081deaa0 ffffffc013b5b830: ffffffc00ae045c0 2edcd99c2d6f1f00 ffffffc013b5b840: ffffffc00848ee10 ffffffc013b5b984 ffffffc013b5b850: 0000000000000000 0000000000000000 ffffffc013b5b860: ffffffc00aecb229 ffffffc00a45f808 ffffffc013b5b870: b13f8fd5464ff906 ffffffc00a2e1e43 ffffffc013b5b880: fffffffffffffffc ffffff8081179e00 ffffffc013b5b890: ffffffc00f531410 ffffff8081179e8c ffffffc013b5b8a0: 9945ada2df32d1cf ec87a19b0bc90485 ffffffc013b5b8b0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8c0: 0000000000000000 00000000ffffffc8 ffffffc013b5b8d0: ffffffc013b5b950 ffffffc013b5b8b0 ffffffc013b5b8e0: 0000000000000000 00000000ffffffc8 #2 [ffffffc013b5b8f0] panic at ffffffc0081dea9c ffffffc013b5b8f0: ffffffc013b5b9a0 ffffffc00814bed8 ffffffc013b5b900: ffffff8088522d98 00000000604003c5 ffffffc013b5b910: ffffffc00ae04650 ffffffc00ae045c0 ffffffc013b5b920: ffffffc00848ee10 ffffffc013b5b984 ffffffc013b5b930: 0000000000000000 ffffffc013b5bac0 ffffffc013b5b940: 00000000000003c0 ffffffc00a2e1e43 ffffffc013b5b950: ffffffc013b5b960 d42100000913aac4 ffffffc013b5b960: 6431383230303439 6533303331616120 ffffffc013b5b970: 6566666635332061 6666663731203034 ffffffc013b5b980: 3234642820393464 0020293030303031 ffffffc013b5b990: 0000000000000000 2edcd99c2d6f1f00 #3 [ffffffc013b5b9a0] die at ffffffc00814bed4 ffffffc013b5b9a0: ffffffc013b5b9e0 ffffffc00814d5b8 ffffffc013b5b9b0: 0000000000000006 ffffffc00983c470 ffffffc013b5b9c0: 0000007f3063c880 ffffffc00848ee10 ffffffc013b5b9d0: ffffffc013b5bac0 ffffffc013b5bac0 #4 [ffffffc013b5b9e0] bug_handler.b1e4d5a5803b26da5893578763b7bc37 at ffffffc00814d5b4 ffffffc013b5b9e0: ffffffc013b5ba10 ffffffc008139fc0 ffffffc013b5b9f0: ffffffc013b5bac0 ffffffc008173bc4 ffffffc013b5ba00: 0000000080400005 ffffffc00980fcd4 #5 [ffffffc013b5ba10] brk_handler.7a506e13af42d94eb8f7517247282dd6 at ffffffc008139fbc ffffffc013b5ba10: ffffffc013b5ba30 ffffffc008173c30 ffffffc013b5ba20: 00000000f2000800 00000000f2000800 #6 [ffffffc013b5ba30] do_debug_exception at ffffffc008173c2c ffffffc013b5ba30: ffffffc013b5ba80 ffffffc00980e968 ffffffc013b5ba40: ffffff8090910658 ffffff8096e81878 ffffffc013b5ba50: 0000000000000000 0000000080400005 ffffffc013b5ba60: ffffffc00848ee10 0000007f3063c880 ffffffc013b5ba70: 00000000f2000800 ffffffc013b5bac0 #7 [ffffffc013b5ba80] el1_dbg at ffffffc00980e964 ffffffc013b5ba80: ffffffc013b5bab0 ffffffc00980e7a4 ffffffc013b5ba90: ffffffc013b5bc10 ffffff817cf01978 ffffffc013b5baa0: 0000000000000000 ffffffc00ac5e000 #8 [ffffffc013b5bab0] el1h_64_sync_handler at ffffffc00980e7a0 ffffffc013b5bab0: ffffffc013b5bbf0 ffffffc008091b10 ffffffc013b5bac0: ffffff8096e81878 ffffff80978bc368 ffffffc013b5bad0: 00000000ffff40f9 ffffffc013b5baa0 ffffffc013b5bae0: ffffff8088522d98 0000000000000000 ffffffc013b5baf0: 0000000000000000 0000000000000000 ffffffc013b5bb00: ffffff8096e81898 0000007fb0f12000 ffffffc013b5bb10: 0000007fb0f18000 0000000000000000 ffffffc013b5bb20: ffffff8090474120 ffffff8090474f68 ffffffc013b5bb30: 0000000000000000 0000000000000008 ffffffc013b5bb40: 0000000000000000 0000000000000000 ffffffc013b5bb50: ffffffc013b45050 ffffffc00ac5e000 ffffffc013b5bb60: 0000000000000000 ffffff8088522848 ffffffc013b5bb70: 0000000000000000 ffffff80978bc310 ffffffc013b5bb80: 0000000000000000 ffffff8096e81878 ffffffc013b5bb90: ffffff8090910658 ffffff8088522d98 ffffffc013b5bba0: ffffff8096e818f0 ffffffc013b5bc70 ffffffc013b5bbb0: ffffffc00848e42c ffffffc013b5bc10 ffffffc013b5bbc0: ffffffc00848ee10 0000000080400005 ffffffc013b5bbd0: 0000007fb0f12000 ffffffc00826e6e8 ffffffc013b5bbe0: ffffffc013b5bc70 ffffffc00848e42c #9 [ffffffc013b5bbf0] el1h_64_sync at ffffffc008091b0c ffffffc013b5bbf0: ffffffc013b5bc70 ffffffc00848ee10 ffffffc013b5bc00: 0000000000000000 ffffffc00ac5e000 ffffffc013b5bc10: ffffff8096e81898 0000000000000000 ffffffc013b5bc20: 0000000000000001 ffffff8096e81878 ffffffc013b5bc30: ffffff8087464008 0000000007fb0f06 ffffffc013b5bc40: ffffff8088522d98 0000000000000000 ffffffc013b5bc50: ffffff8087464000 0000000000000000 ffffffc013b5bc60: 0000007fb0f06000 0000000000000000 #10 [ffffffc013b5bc70] __vma_adjust at ffffffc00848ee0c ffffffc013b5bc70: ffffffc013b5bcd0 ffffffc008491bc0 ffffffc013b5bc80: ffffff80d9aeb900 0000000000000000 ffffffc013b5bc90: 0000000000000000 ffffffc013b5bd88 ffffffc013b5bca0: 0000000000000000 0000000000000000 ffffffc013b5bcb0: 0000000000000000 ffffff8096e81878 ffffffc013b5bcc0: 0000007fb0f12000 ffffff8088522d98 #11 [ffffffc013b5bcd0] __split_vma at ffffffc008491bbc ffffffc013b5bcd0: ffffffc013b5bd20 ffffffc008491e18 ffffffc013b5bce0: 0000007fb0f14000 0000000000000001 ffffffc013b5bcf0: ffffff8096e81878 0000000000000001 ffffffc013b5bd00: 0000007fb0f12000 ffffff8087464000 ffffffc013b5bd10: 0000007fb0f12000 0000000000002000 #12 [ffffffc013b5bd20] __do_munmap at ffffffc008491e14 ffffffc013b5bd20: ffffffc013b5bda0 ffffffc008492630 ffffffc013b5bd30: ffffff80d9aeb900 0000000000000000 ffffffc013b5bd40: 0000000000000000 0000000000000000 ffffffc013b5bd50: 0000000000000000 0000000000000001 ffffffc013b5bd60: 0000007fb0f12000 0000000000002000 ffffffc013b5bd70: ffffff8087464068 ffffff8087464000 ffffffc013b5bd80: 0000000000000027 ffffffc013b5bd88 ffffffc013b5bd90: ffffffc013b5bd88 2edcd99c2d6f1f00 #13 [ffffffc013b5bda0] __vm_munmap at ffffffc00849262c ffffffc013b5bda0: ffffffc013b5bde0 ffffffc00849276c ffffffc013b5bdb0: 0000000000000000 0000000000000000 ffffffc013b5bdc0: ffffff80d9aeb900 00000000000000d7 ffffffc013b5bdd0: 0000007fb0f12000 0000000000002000 #14 [ffffffc013b5bde0] __arm64_sys_munmap at ffffffc008492768 ffffffc013b5bde0: ffffffc013b5be10 ffffffc008159204 ffffffc013b5bdf0: ffffffc00a4d4a80 ffffffc013b5beb0 ffffffc013b5be00: 0000000000000000 0000000000000000 #15 [ffffffc013b5be10] invoke_syscall at ffffffc008159200 ffffffc013b5be10: ffffffc013b5be30 ffffffc008159110 ffffffc013b5be20: ffffffc00a4d4a80 ffffffc013b5beb0 #16 [ffffffc013b5be30] el0_svc_common at ffffffc00815910c ffffffc013b5be30: ffffffc013b5be70 ffffffc008158fc4 ffffffc013b5be40: 0000000000001000 ffffffc00980eda4 ffffffc013b5be50: 0000007fb1202c44 00000000ffffffff ffffffc013b5be60: ffffffc17239c000 ffffffc013b5beb0 #17 [ffffffc013b5be70] do_el0_svc at ffffffc008158fc0 ffffffc013b5be70: ffffffc013b5be80 ffffffc00980edb0 #18 [ffffffc013b5be80] el0_svc at ffffffc00980edac ffffffc013b5be80: ffffffc013b5bea0 ffffffc00980ed20 ffffffc013b5be90: 0000000000000000 0000000000000000 #19 [ffffffc013b5bea0] el0t_64_sync_handler at ffffffc00980ed1c ffffffc013b5bea0: ffffffc013b5bfe0 ffffffc008091e48 ffffffc013b5beb0: 0000007fb0f12000 0000000000002000 ffffffc013b5bec0: 0000000000000000 0000000000002000 ffffffc013b5bed0: 0000007fb115222a 0000007fb115222a ffffffc013b5bee0: 0000000031373232 3a6b636174735f6c ffffffc013b5bef0: 00000000000000d7 0000000080000001 ffffffc013b5bf00: 0000007fb126eb98 0000000000000004 ffffffc013b5bf10: 0000000000000000 00000000000000aa ffffffc013b5bf20: 0000000000000aa0 0000000000000000 ffffffc013b5bf30: 000000555802c560 0000007fb1257e44 ffffffc013b5bf40: 0000000000000000 0000000000002000 ffffffc013b5bf50: 0000007fb0f12000 0000007f3063cac4 ffffffc013b5bf60: 0000000000000000 0000000000001fdd ffffffc013b5bf70: 0000000000000001 0000000000000008 ffffffc013b5bf80: 0000007f3063ca88 0000007f3063ca78 ffffffc013b5bf90: 0000007fb1279000 0000007f3063c850 ffffffc013b5bfa0: 0000007fb11ea3c4 0000007f3063c850 ffffffc013b5bfb0: 0000007fb1202c44 0000000000001000 ffffffc013b5bfc0: 0000007fb0f12000 00000000000000d7 ffffffc013b5bfd0: 0000000000000000 0000000000000000 #20 [ffffffc013b5bfe0] el0t_64_sync at ffffffc008091e44 PC: 0000007fb1202c44 LR: 0000007fb11ea3c4 SP: 0000007f3063c850 X29: 0000007f3063c850 X28: 0000007fb1279000 X27: 0000007f3063ca78 X26: 0000007f3063ca88 X25: 0000000000000008 X24: 0000000000000001 X23: 0000000000001fdd X22: 0000000000000000 X21: 0000007f3063cac4 X20: 0000007fb0f12000 X19: 0000000000002000 X18: 0000000000000000 X17: 0000007fb1257e44 X16: 000000555802c560 X15: 0000000000000000 X14: 0000000000000aa0 X13: 00000000000000aa X12: 0000000000000000 X11: 0000000000000004 X10: 0000007fb126eb98 X9: 0000000080000001 X8: 00000000000000d7 X7: 3a6b636174735f6c X6: 0000000031373232 X5: 0000007fb115222a X4: 0000007fb115222a X3: 0000000000002000 X2: 0000000000000000 X1: 0000000000002000 X0: 0000007fb0f12000 ORIG_X0: 0000007fb0f12000 SYSCALLNO: d7 PSTATE: 00001000 这是完整的内核崩溃栈和寄存器打印,我需要你分析原因,当前有crash工具以及vmcore,vmlinux
最新发布
07-26
评论 2
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值