Posts tagged: git

Has no upstream branch errors in git [1] can be such a damn productivity killer. You gotta stop your flow and swap over the branch, there is a config so that you don’t have to do this. fatal has no upstream branch # [2] If you have not yet configured git to always push to the current branch, you will get a has no upstream branch error if you don’t explicitly set it. Let’s show an example git checkout -b feat/ingest-inventory-data git add conf/base/catalog.yml git commit -m "feat: ingest inventory data from abc-db" git push You will be presented with the following error. fatal: The current branch feat/ingest-inventory-data has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin feat/ingest-inventory-data Option 1: follow the instructions # [3] To resolve this fatal error your first option is simply to follow the instructions given. Just copy and paste it in. git push --set-upstream origin feat/ingest-inventory-data Option 2: push to the current branch without setting upstream # [4] Honestly, I am pretty aware of the branch I am on, and Very few times have I ever accidentally pushed to the wrong branch. The on...

Once you give a branch the big D (git branch -D mybranch) its gone, its lost from your history. It’s completely removed from your log. There will be no reference to these commits, or will there? TLDR # [1] Checkout is your savior, all you need is the commit hash. Immediate Regret # [2] your terminal is still open We have all done this, you give branch the big D only to realize it was the wrong one. Don’t worry, not all is lost, this is the easiest to recover from. When you run the delete command you will see something like this. ❯ git branch -D new Deleted branch new (was bc02a64). Notice the hash is right there is the hash of your commit. You can use that to get your content back. git checkout -b bc02a64 git branch new # or in one swoop checkout your new branch at the `start-point` you want git checkout -b new bc02a64 Delayed reaction # [3] you have closed your terminal If you have closed your terminal, or have deleted with a gui or something that does not tell you the hash as you run it, don’t fret, all your work is still there (as long as you have commited). You just have to dig it out. The reflog contains a list of all git [4] operations that have occurred on your ...

It’s nearly impossible to completely loose a file if it is commited to git [1]. It’s likely harder to fully remove the file than it is to recover it, but how do we go about recovering those precious files that we have lost. Listing all the deleted files in all of git history can be done by combining git log with --diff-filter. The log gives you lots of options to show different bits of information about the commit that happened at that point. It’s even possible to get a completely clean list of files that are in your git history but have been deleted. git log –diff-filter # [2] These various commands will show all files that were ever deleted on your current branch. # This one includes the date, commit hash, and Author git log --diff-filter D # this one could be a git alias, but includes empty lines git log --diff-filter D --pretty="format:" --name-only # this one has the empty lines cleaned up git log --diff-filter D --pretty="format:" --name-only | sed '/^$/d' git diff-filter [3] git reflog –diff-filter # [4] The reflog can be super powerful in finding lost files here, as it only cares about git operations, not just the current branch. It will search accross all branch...

Git [1] commands such as diff, log, whatchanged all take a flag called --diff-filter. This can filter for only certain types of diffs, such as added (A), modified (M), or deleted (D). Man page # [2] You can find the full description by searching for --diff-filter in the man git diff page. --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]] Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (i.e. regular file, symlink, submodule, ...) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected. Also, these upper-case letters can be downcased to exclude. E.g. --diff-filter=ad excludes added and deleted paths. Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Sim...

Git [1] has a built in way to rebase all the way back to the beginning of time. There is no need to scroll through the log to find the first hash, or find the total number of commits. Just use --root. git rebase --root References: [1]: /glossary/git/

Git [1] reflog can perform some serious magic in reviving your hard work from the dead if you happen to loose it. caveat # [2] You must git commit! If you never commit the file, git cannot help you. You might look into your trashcan, filesystem versions, onedrive, box, dropbox. If you have none of this, then you are probably hosed. practice # [3] I really like to practice these techniques before I need to use them so that I understand how they work in a low stakes fashion. This helps me understand what I can and cannot do, and how to do it in a place that does not matter in any way at all. This is what I did to revive a dropped docker-compose.yml file. The idea is that if I can find the commit hash, I can cherry-pick it. git init touch readme.md git add readme.md git commit -m "add readme" touch docker-compose.yml git add docker-compose.yml git commit -m "add docker-compose" git reset 3cfc --hard git reflog # copy the hash of the commit with my docker-compose commit git cherry-pick fd74df3 reflog # [4] Here was the final reflog that shows all of my git actions. note I did reset twice. ❯ git reflog --name-only 0404b6a (HEAD -> main) HEAD@{0}: cherry-pick: add docker-compo...

Right inside the git [1] docs [2], is states that the git reflog command runs git reflog show by default which is an alias for git log -g --abbrev-commit --pretty=oneline This epiphany deepens my understanding of git, and lets me understand that most git log flags might also work with git log -g. full or short format # [3] Here are some git commands for you to try out on your own that are all pretty similar, but vary in how much information they show. # These show only first line of the commit message subject, the hash, and index git reflog git log -g --abbrev-commit --pretty=oneline # similar to git log, this is a fully featured log with author, date, and full # commit message git log -g add files # [4] If I am looking for a missing file, I might want to leverage --name-only or --stat, to see where I might have hard reset that file, or deleted it. git reflog --stat git log -g --stat --abbrev-commit --pretty=oneline git reflog --name-only git log -g --name-only --abbrev-commit --pretty=oneline example # [5] Here is an example where I lost my docker-compose.yml file in a git reset, and got it back by finding the commit hash with git reflog and cherry picked it back. ❯...

I’ve never found a great use for a global .gitignore file. Mostly I fear that by adding a lot of the common things like .pyc files it will be missing from the project and inevitably be committed to the project by someone else. Personal Tools # [1] Within the past year I have added some tools to my personal setup that are not required to run the project, but works really well with my setup. They are direnv and pyflyby. Since these both support project level configuration, are less common, and not in most .gitignore templates they make for great candidates to add to a global .gitignore file. create the config # [2] Like any .gitignore it supports gits wildignore syntax. I made a ~/dotfiles/git/.global_gitignore file, and added the following to it. .envrc .pyflyby .copier-defaults .venv*/ .python-version markout .markata.cache Once I had this file, I stowed it into ~/.global_gitignore. cd ~/dotfiles/ stow git Always stow your dotfiles, don’t set yourself up for wondering why your next machine is not working right. stow note # [3] Note, the reason that it is a ~/.global_gitignore and not a ~/.gitignore is that I was unable to stow a .gitignore file. They must be ignored by ...

Fugitive comes with a pretty sick way to commit files and see the diff at the same time with verbose commit. Opening the fugitive menu with :G brings up your git [1] status, you can stage files with s, unstage them with u, toggle them with -, and toggle their diff with >. Once you have staged your files for commit, you can commit with cc, but today I found that you can commit verbose with cvc. This brings up not only a commit widow with your git status shown, but the diff that you are about to commit. [2] example of a verbose commit in fugitive References: [1]: /glossary/git/ [2]: https://images.waylonwalker.com/fugitive-verbose-commit.png