Storing fresh linux-next repository locally with smallest possible effort
Sometimes git pull is as fast as usual, but quite often it deals with inexact rename detection for a long time. After all, there is repo with merge conflicts and I need to re-clone linux-next to feel myself calm, because I'm not familiar with vimdiff or bcompare.
What should I watch for?
Comments
-
https://www.kernel.org/best-way-to-do-linux-clones-for-your-ci.html
I am unable to understand your question... but this might help you
Why would you be having merge conflicts while making pulls? Try stashing your changes before you fetch linux-next.1 -
Why would you be having merge conflicts while making pulls? Try stashing your changes before you fetch linux-next.
I don't know why it happens, but it happens even without any changes to tree from my side. Steps to reproduce are:
1. clone linux-next
2. git pull -> success
3. git pull # on the next day -> success ("successfull pull" means that git status prints 'nothing to commit, working tree clean', git pull prints 'Already up to date.'
4. git pull # at some point -> inexact renames, merge conflicts, need to deal with mergetool or smth.0 -
Instead of "git pull" try the following to add remote and then fetch and rebase to a tag and see if it works better:
git remote add next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
git fetch next
git rebase tagMight work better than "git pull" - next pulls from several repos and could be prone to conflicts
2 -
It happens to me before. I believe this might be due to the remote having history rewrite ? Sounds a bit crazy though
Anyway what I did was simply
git reset --hard origin/master
0 -
Both hard reset and fetch + rebase works.
Also
git config pull.rebase = true # default is false (merge)
solves problem.0
Categories
- All Categories
- 112 LFX Mentorship
- 112 LFX Mentorship: Linux Kernel
- 604 Linux Foundation IT Professional Programs
- 315 Cloud Engineer IT Professional Program
- 139 Advanced Cloud Engineer IT Professional Program
- 52 DevOps Engineer IT Professional Program
- 67 Cloud Native Developer IT Professional Program
- 3 Express Training Courses
- 3 Express Courses - Discussion Forum
- 5.3K Training Courses
- 17 LFC110 Class Forum - Discontinued
- 8 LFC131 Class Forum
- 30 LFD102 Class Forum
- 178 LFD103 Class Forum
- LFD110 Class Forum
- 24 LFD121 Class Forum
- LFD133 Class Forum
- 2 LFD137 Class Forum
- 62 LFD201 Class Forum
- 2 LFD210 Class Forum
- 1 LFD210-CN Class Forum
- 1 LFD213 Class Forum - Discontinued
- 127 LFD232 Class Forum - Discontinued
- LFD233 Class Forum
- LFD237 Class Forum
- 22 LFD254 Class Forum
- 643 LFD259 Class Forum
- 107 LFD272 Class Forum
- 1 LFD272-JP クラス フォーラム
- 4 LFD273 Class Forum
- 1 LFS101 Class Forum
- LFS112 Class Forum
- LFS116 Class Forum
- LFS118 Class Forum
- LFS142 Class Forum
- LFS144 Class Forum
- 2 LFS145 Class Forum
- LFS146 Class Forum
- LFS151 Class Forum
- LFS157 Class Forum
- LFS158 Class Forum
- LFS162 Class Forum
- LFS167 Class Forum
- 28 LFS200 Class Forum
- 735 LFS201 Class Forum - Discontinued
- 1 LFS201-JP クラス フォーラム
- 13 LFS203 Class Forum
- 98 LFS207 Class Forum
- 299 LFS211 Class Forum
- 54 LFS216 Class Forum
- 47 LFS241 Class Forum
- 41 LFS242 Class Forum
- 36 LFS243 Class Forum
- 12 LFS244 Class Forum
- LFS245 Class Forum
- 41 LFS250 Class Forum
- 1 LFS250-JP クラス フォーラム
- LFS251 Class Forum
- 141 LFS253 Class Forum
- LFS254 Class Forum
- LFS255 Class Forum
- 2 LFS256 Class Forum
- LFS257 Class Forum
- 1.2K LFS258 Class Forum
- 9 LFS258-JP クラス フォーラム
- 109 LFS260 Class Forum
- 144 LFS261 Class Forum
- 39 LFS262 Class Forum
- 82 LFS263 Class Forum - Discontinued
- 15 LFS264 Class Forum - Discontinued
- 11 LFS266 Class Forum - Discontinued
- 20 LFS267 Class Forum
- 18 LFS268 Class Forum
- 26 LFS269 Class Forum
- 198 LFS272 Class Forum
- 1 LFS272-JP クラス フォーラム
- LFS274 Class Forum
- 3 LFS281 Class Forum
- 254 LFW211 Class Forum
- 173 LFW212 Class Forum
- 9 SKF100 Class Forum
- SKF200 Class Forum
- 781 Hardware
- 198 Drivers
- 68 I/O Devices
- 37 Monitors
- 95 Multimedia
- 174 Networking
- 87 Printers & Scanners
- 83 Storage
- 742 Linux Distributions
- 80 Debian
- 66 Fedora
- 15 Linux Mint
- 13 Mageia
- 23 openSUSE
- 143 Red Hat Enterprise
- 31 Slackware
- 13 SUSE Enterprise
- 347 Ubuntu
- 450 Linux System Administration
- 31 Cloud Computing
- 69 Command Line/Scripting
- Github systems admin projects
- 89 Linux Security
- 76 Network Management
- 101 System Management
- 46 Web Management
- 51 Mobile Computing
- 18 Android
- 23 Development
- 1.2K New to Linux
- 1K Getting Started with Linux
- 355 Off Topic
- 109 Introductions
- 167 Small Talk
- 18 Study Material
- 504 Programming and Development
- 283 Kernel Development
- 203 Software Development
- 844 Software
- 210 Applications
- 180 Command Line
- 3 Compiling/Installing
- 107 Games
- 308 Installation
- 51 All In Program
- 51 All In Forum
Upcoming Training
-
August 20, 2018
Kubernetes Administration (LFS458)
-
August 20, 2018
Linux System Administration (LFS301)
-
August 27, 2018
Open Source Virtualization (LFS462)
-
August 27, 2018
Linux Kernel Debugging and Security (LFD440)