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
- 9.8K All Categories
- 26 LFX Mentorship
- 79 LFX Mentorship: Linux Kernel
- 439 Linux Foundation Boot Camps
- 259 Cloud Engineer Boot Camp
- 88 Advanced Cloud Engineer Boot Camp
- 40 DevOps Engineer Boot Camp
- 19 Cloud Native Developer Boot Camp
- Express Training Courses
- Express Courses - Discussion Forum
- 1.5K Training Courses
- 17 LFC110 Class Forum
- 3 LFC131 Class Forum
- 18 LFD102 Class Forum
- 113 LFD103 Class Forum
- 8 LFD121 Class Forum
- 59 LFD201 Class Forum
- 1 LFD213 Class Forum - Discontinued
- 128 LFD232 Class Forum
- 23 LFD254 Class Forum
- 528 LFD259 Class Forum
- 99 LFD272 Class Forum
- 1 LFD272-JP クラス フォーラム
- 1 LFS145 Class Forum
- 19 LFS200 Class Forum
- 736 LFS201 Class Forum
- 1 LFS201-JP クラス フォーラム
- LFS203 Class Forum
- 23 LFS207 Class Forum
- 292 LFS211 Class Forum
- 53 LFS216 Class Forum
- 41 LFS241 Class Forum
- 33 LFS242 Class Forum
- 31 LFS243 Class Forum
- 9 LFS244 Class Forum
- 27 LFS250 Class Forum
- 1 LFS250-JP クラス フォーラム
- 125 LFS253 Class Forum
- 922 LFS258 Class Forum
- 10 LFS258-JP クラス フォーラム
- 79 LFS260 Class Forum
- 122 LFS261 Class Forum
- 27 LFS262 Class Forum
- 77 LFS263 Class Forum
- 15 LFS264 Class Forum
- 10 LFS266 Class Forum
- 13 LFS267 Class Forum
- 16 LFS268 Class Forum
- 13 LFS269 Class Forum
- 190 LFS272 Class Forum
- 1 LFS272-JP クラス フォーラム
- 201 LFW211 Class Forum
- 147 LFW212 Class Forum
- 888 Hardware
- 211 Drivers
- 74 I/O Devices
- 44 Monitors
- 115 Multimedia
- 206 Networking
- 98 Printers & Scanners
- 85 Storage
- 744 Linux Distributions
- 88 Debian
- 64 Fedora
- 12 Linux Mint
- 13 Mageia
- 24 openSUSE
- 132 Red Hat Enterprise
- 33 Slackware
- 13 SUSE Enterprise
- 353 Ubuntu
- 465 Linux System Administration
- 37 Cloud Computing
- 65 Command Line/Scripting
- Github systems admin projects
- 94 Linux Security
- 77 Network Management
- 107 System Management
- 47 Web Management
- 59 Mobile Computing
- 21 Android
- 24 Development
- 1.2K New to Linux
- 1.1K Getting Started with Linux
- 523 Off Topic
- 126 Introductions
- 210 Small Talk
- 19 Study Material
- 780 Programming and Development
- 254 Kernel Development
- 492 Software Development
- 918 Software
- 255 Applications
- 181 Command Line
- 2 Compiling/Installing
- 75 Games
- 316 Installation
- 45 All In Program
- 45 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)