Quick and dirty cheat sheet for using git
git config --global user.name "Username"
git config --global user.email "firstname.lastname@example.org"
Check log of commits
Add all files to staging to be committed
git add -A
Setup .gitignore, to ignore files and directories
Example to add .DS_Store files to the ignore file.
echo ".DS_Store" >> .gitignore
git reset --hard
Setup a branch
git branch branch_name
Switch to a branch
git checkout branch_name
Merge branch to master
git checkout master
git merge branch_name
Remote Repository (GitHub)
You’ll can setup SSH keys to connect to GitHub.
git remote add origin email@example.com:OWNER/REPO.git
git push --set-upstream origin master
Upload files to GitHub
git push origin master
Verify remote origin
git remote -v
Set origin URL (Helpful if it has already been added)
git remote set-url origin firstname.lastname@example.org:OWNER/REPO.git
Git object files are a zlib compressed data file type.
We can check this by running the file command. “6ae4147121f0165e7c0e309bad649c2c4d3a55” is our git file of interest.
$ file 6ae4147121f0165e7c0e309bad649c2c4d3a55
6ae4147121f0165e7c0e309bad649c2c4d3a55: zlib compressed data
The above link has helpful information. Easiest way I found was to install zlib-flate by installing qpdf with apt.
sudo apt install qpdf
We can now use the zlib-flate command with the -uncompress option to decompress the file and print the contents.
$ zlib-flate -uncompress < 6ae4147121f0165e7c0e309bad649c2c4d3a55
var b64 = ("");
All the following commands are run from the “/opt/librenms” directory
$ sudo ./daily.sh
Re-running /opt/librenms/daily.sh as librenms user
Updating to latest codebase FAIL
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
Checking with validate.php shows that you can run githup-remove to fix it
$ sudo ./validate.php
[WARN] Your install is over 24 hours out of date, last update: Mon, 23 Feb 2020 05:43:12 +0000
Make sure your daily.sh cron is running and run ./daily.sh by hand to see if there are any errors.
[WARN] Your local git contains modified files, this could prevent automatic updates.
You can fix this with ./scripts/github-remove
Run “sudo ./scripts/github-remove -d”
$ sudo ./scripts/github-remove -d
Are you sure you want to delete all modified and untracked files? [y/N] y
You should also be able to remove the files individually if the above command does not work.
Run validate again to make sure it checks out good.
Now run ./daily.sh