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/master0 -
Both hard reset and fetch + rebase works.
Also
git config pull.rebase = true # default is false (merge)
solves problem.0
Categories
- All Categories
- 179 LFX Mentorship
- 179 LFX Mentorship: Linux Kernel
- 778 Linux Foundation IT Professional Programs
- 384 Cloud Engineer IT Professional Program
- 175 Advanced Cloud Engineer IT Professional Program
- 76 DevOps IT Professional Program - Discontinued
- 8 DevOps & GitOps IT Professional Program
- 104 Cloud Native Developer IT Professional Program
- 7.7K Training Courses & Learning Paths
- 21 AI & ML Training
- 2 Blockchain & Decentralized Identity Training
- 54 Cloud & Containers Training
- 7 Cybersecurity Training
- 5 DevOps & Site-Reliability Training
- 3 Linux Kernel Development Training
- 3 Networking Training
- 2 Open Source Best Practice Training
- 12 System Administration Training
- 1 System Engineering Training
- 6 Web & Application Development Training
- 799 Hardware
- 202 Drivers
- 68 I/O Devices
- 37 Monitors
- 97 Multimedia
- 173 Networking
- 91 Printers & Scanners
- 92 Storage
- 776 Linux Distributions
- 83 Debian
- 68 Fedora
- 25 Linux Mint
- 13 Mageia
- 24 openSUSE
- 151 Red Hat Enterprise
- 32 Slackware
- 13 SUSE Enterprise
- 356 Ubuntu
- 474 Linux System Administration
- 31 Cloud Computing
- 73 Command Line/Scripting
- Github systems admin projects
- 104 Linux Security
- 79 Network Management
- 102 System Management
- 47 Web Management
- 194 Mobile Computing
- 32 Android
- 146 Development
- 1.2K New to Linux
- 1K Getting Started with Linux
- 409 Off Topic
- 129 Introductions
- 36 Study Material
- 1.1K Programming and Development
- 312 Kernel Development
- 739 Software Development
- 1K Software
- 421 Applications
- 183 Command Line
- 5 Compiling/Installing
- 71 Games
- 320 Installation
- Archived
- 183 Small Talk
- 2 LFD140 Class Forum
- 1.4K LFS258 Class 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)
