Programming @programming.dev tunawasherepoo @iusearchlinux.fyi 1y ago

did git add . in subfolder 🤡

I'm doing a solo coding project for work. It's a tool that you interact with similar to npm or cargo, where you can create a new workspace, run / test etc. Importantly, you have to be in the working directory for the commands to work...

Yesterday I decided to go home early to do remote work at home. Before i left i quickly did git add ., committed and pushed. I turned on my computer this morning, ran git pull, and noticed that... only some files got pushed, but more importantly none of the code i wrote yesterday made it through. Yup, I was still cd'd into my workspace folder and not at the project root, so I only committed the mock workspace folder 😄

Luckily i didnt write or change much this time, but lesson learned: git add -A or git commit -am '...'

9 comments

When staging files to commit, you can use an interactive patch:

git add -p

Before you make your commit, you can inspect what's being committed:

git diff --cached

If there are things you want to remove, you can do so with interactive patches, too:

git reset -p

You can also pass directories or files to any of these commands to include a subset of your project in the command.
- omg these are great commands, thanks for sharing :)
  
  git is definitely a weak spot for me in general, there's a lot of commands and similar commands, so my approach until now has been to forget they exist haha
  
  You bet! You can always check the man pages by adding a hyphen between the git commands, too, like so:
  
  man git-diff
  
  man git-add
  
  It's exhaustive, but you can search the page with slash (/) 👍
Even better, just choose exactly which files to add to a commit, and keep the commits small and meaningful units of work! If you never use the shorthand, you won't have this issue, and your commit history will be easier to understand and expand upon!
- This is what i should be doing :)
  
  I have been justifying it away though cause it's early stages of the project so it's hard to get my bearings. But the dust is starting to settle enough now that I can probably think about committing units of work rather than this daily snapshotting ive been doing
I always do a git status just to be sure before a commit
Can't you ssh into your work computer?
- In my 20 year career, I’ve never had a single position where I could ssh into my work machine from a remote location.
  
  I would say that if you have been able to do that, it’s exceptionally rare, and there are a number of security red flags of your organization is allowing that.

9 comments