Display current git branch in the terminal prompt (PS1)

[Shulammite-Aso]

Fixes gitpod-io/gitpod#3284

[gitpod-io]

[Shulammite-Aso]

@jankeromnes, please take a look.

[jankeromnes]

Super-cool! Many thanks @Shulammite-Aso for taking on & fixing this issue 💯 x 🙏

Also, sorry for the delay in reviewing this! I'll take a look now, and I'll also make CircleCI build your PR so that we get images we can test on actual repositories. 😊

[Shulammite-Aso]

Alrigth @jankeromnes, can't wait! 😃

[jankeromnes]

Thanks again for this great work @Shulammite-Aso 😁

I believe it's almost perfect as is, but noticed a very small issue, that basically just requires adding a few \ to the correct places.

Please simply add the missing \ where expected (see the code suggestion below), and then I'll trigger a new CircleCI build and we'll be able to test the updated fix in Gitpod.

I've also added some more thoughts & details (sorry for being so verbose 😅) but feel free to skip them if you like. (Or, if you have any question / if anything seems unclear, please let me know and I'll be happy to help!)

[Shulammite-Aso]

Okay @jankeromnes. Taking a moment to read, understand, then make the necessary changes. Will let you know if I have a question.

[Shulammite-Aso]

@jankeromnes, I get this now and trying to make the changes, but I just saw that I have reached my monthly workspace hour limit, sadly. Now I don't know if there's any other way around this? I've been playing around using the workspaces for the past weeks. It almost slipped my mind that I'm on a very limited plan. 🤦‍♀️

[jankeromnes]

trying to make the changes, but I just saw that I have reached my monthly workspace hour limit

Oh no 🙈 sorry for the disappointing "surprise" there! Given that you're contributing to Gitpod, I've just granted you 20 bonus hours, so that you can still use Gitpod when your "regular" monthly hours run out. (Please let me know if this ever blocks you again!)

[Shulammite-Aso]

commited!

Given that you're contributing to Gitpod, I've just granted you 20 bonus hours,

Thanks for this. Will start keeping my limit in mind.

[jankeromnes]

Alright, many thanks for the fix! This now looks perfect. ✨

I've also made CircleCI build this Pull Request, which resulted in the Docker image gitpod/workspace-base:branch-pr-447 getting published to Docker Hub. Let's hook this up with a repository, and briefly test it in Gitpod, to confirm that everything works as intended.

Updates:

• I've created a test repository, pointing to this PR's workspace image: https://github.com/jankeromnes/test-gitpod-prompt/blob/main/.gitpod.yml

• We can now test that image by opening the above repository in Gitpod, e.g. by visiting this URL: https://gitpod.io/#https://github.com/jankeromnes/test-gitpod-prompt

[jankeromnes]

Alright, this works like a charm! 🎉 🎆 Thus I'm approving this Pull Request, and it can be merged soon.

Thanks again for implementing this!

---

I've just noticed one tiny problem, but it seems completely unrelated to this code change (probably a random new bug in our code): Every new IDE Terminal now shows this error as the first line:

ls: cannot access '/home/gitpod/.bashrc.d/*': No such file or directory

I'll investigate this a bit more, to see if I can find a fix for it, but otherwise I think we should merge your PR quite soon. 😊

[Shulammite-Aso]

Alright, this works like a charm! 🎉 🎆 Thus I'm approving this Pull Request, and it can be merged soon.

nice to see!! 💃 🎉 🎉

[Shulammite-Aso]

Thanks for letting me contribute @jankeromnes!! 😁 😁

[jankeromnes]

ls: cannot access '/home/gitpod/.bashrc.d/*': No such file or directory

I'll investigate this a bit more, to see if I can find a fix for it, but otherwise I think we should merge your PR quite soon. 😊

Ah, I think I understand the problem now -- to test this Pull Request, I've used the gitpod/workspace-base image instead of the more complete gitpod/workspace-full. It would seem that this line logs an error when the $HOME/.bashrc.d directory is empty (while instead it should not log an error and just do nothing):

workspace-images/base/Dockerfile

Line 54 in d57c5f4

(echo; echo "for i in \$(ls \$HOME/.bashrc.d/*); do source \$i; done"; echo) >> /home/gitpod/.bashrc

In other words, this bug existed before, and has indeed nothing to do with this Pull Request -- so I'll merge this now, and fix the bug in a separate Pull Request. 😁 🙌

Thanks for letting me contribute @jankeromnes!! 😁 😁

You're quite welcome! 😁 And all the thanks go to you, for doing all the work 🙏

[Shulammite-Aso]

You're quite welcome! 😁 And all the thanks go to you, for doing all the work 🙏

🎉🎉🎉

@jankeromnes I'm also willing to make another contribution! I know I should probably not take up another good-first-issue, as it will no longer be my first. Unless it's absolutely okay to do that.:smile: Otherwise I can make changes to a react/typescript and nodejs/typescript codebase. I'm yet to comfortably pick up Golang, hopefully, I do so soon.

[ArthurSens]

Hey @jankeromnes, is this deployed alongside Gitpod when we update production? I'm not sure if I'm supposed to move this to "Done" in the groundwork project 🤔

[ArthurSens]

Friendly ping for the question above /\