git submodule

There are some interesting articles out there about git submodules

Tips:

• cd into the submodule directory and do git status.
  • Many things just become clear that way!

References:

• https://stackoverflow.com/questions/7993413/git-submodules-with-modified-and-untracked-content-why-and-how-to-remove-it
• https://gist.github.com/gitaarik/8735255
• https://www.techjini.com/blog/working-with-git-submodules/
• https://medium.com/fiverr-engineering/working-with-git-submodules-ec6210801e07
• https://longair.net/blog/2010/06/02/git-submodules-explained/

Advertisements

Git branch cleanups

• git remote prune origin –dry-run
• (Local) git branch -d <localbranch>

 

References:

• https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches#Tracking-Branches

gitignore and nuget

https://www.gitignore.io/

• Super useful!

 

I recently ran into an issue – after downloading my c# project from github, i could not build the project. basically on compilation, the project was complaining saying there were missing references and such.

• When i opened nuget manager, it showed the packages were all installed.
• The packages folder was present.

It seemed the problem was because VS was assuming that the packages are there, so it was avoiding downloading the packages again. However, the content inside the ‘packages’ folder was not complete – aka .dlls were missing from the packages folder because there had been git-ignored.

It seems I had not done the gitignore properly !  In the references below, there is an example of how to gitignore VS projects properly.

<snip>

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

</snip>

 

References:

• https://github.com/github/gitignore
  • For VS projects, the gitignore file to use is this : https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

 

Git Credentials. Avoid repetitions using Credential Helpers.

Tips:

• https://stackoverflow.com/questions/21615431/git-pushes-with-wrong-user-from-terminal
• https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
• https://help.github.com/articles/caching-your-github-password-in-git/
• https://stackoverflow.com/questions/15381198/remove-credentials-from-git
  • This showed how to delete generic credentials credentials stored on the machine
• In cases when 2FA is required  one needs to add a personal access token.
  • We can create one by ourselves following the steps above.
  • As an alternative, we can install ‘Git Credential Manager for Windows’.  After installing the credential manager, you will be able to ‘git-credential-manager.exe’ in your git folder  (libexec\git-core) . This makes things much easier.

 

---

I recently had to figure out how to save my git credentials, so i wouldn’t have to keep typing them repeatedly.

The references below helped me get past the issue. Some notes below:

Notes:

• The credentials are set separately for each repo.
• Read the documentation that is provided with “git help credentials”
  • “Credential helpers, on the other hand, are external programs from which Git can request both usernames and passwords; they typically interface with secure storage provided by the OS or other programs.”
• I ended up using a Credential manager
  • I installed the Git Credential manager for Windows.
• Initially the command “git config –list”   did not have a ‘credential.helper’ set
  • As mentioned in the reference #2, i set it by using :  git config credential.helper manager.
  • After doing this,  I could save my username and password and avoid the repetiotion

 

 

References:

• $ git help credentials. <-- Read this! Very Useful

• https://github.com/Microsoft/Git-Credential-Manager-for-Windows

 

Git : Undo commits, Viewing Unpushed Git Commits

Tips:

[1] First note that there is a difference between ‘revert’ and ‘reset’

• https://www.atlassian.com/git/tutorials/undoing-changes/git-revert
• ‘reset’ is quite dangerous

 

[2]  Undoing a ‘git add’ before doing a ‘git commit’

• http://stackoverflow.com/questions/19730565/how-to-remove-files-from-git-staging-area
• http://stackoverflow.com/questions/348170/how-to-undo-git-add-before-commit
• http://stackoverflow.com/questions/7103631/how-to-unstage-large-number-of-files-without-deleting-the-content

Note:  For this scenario, most of the above links are recommending doing a ‘git reset’. There is a difference between a ‘soft’ reset and a ‘hard’ reset.

• https://git-scm.com/blog/2011/07/11/reset.html
  • This is a very interesting read and helped me clarify a lot of concepts!

 

[3] Recently I had to undo a commit I had made into my local git repo. I was under the impression that reverting commits in Git is a big hassle. To my surprise, it didn’t prove to be too much of a pain. These are things I had to do basically:

• couple of git reset --soft HEAD~ commands (because there was stuff I had pulled into my repo after commiting)
• couple of   git checkout —  <file> commands to undo my inadvertent changes.

That was it!  I got my repo back to sanity.

 

[4]  Another import task is to view unpushed git commits. this is an important thing to do, especially before making commits into a remote branch.

• http://stackoverflow.com/questions/2016901/viewing-unpushed-git-commits
• http://stackoverflow.com/questions/3080509/list-git-commits-not-pushed-to-the-origin-yet

 

References:

• http://stackoverflow.com/questions/927358/how-do-you-undo-the-last-commit
• https://www.atlassian.com/git/tutorials/undoing-changes/git-revert
• http://sethrobertson.github.io/GitFixUm/fixup.html
• https://github.com/blog/2019-how-to-undo-almost-anything-with-git