From 5380212c88e7712dfbb8d3a8c530bd5cdab2d361 Mon Sep 17 00:00:00 2001 From: Brian Epstein Date: Tue, 9 Mar 2021 17:12:54 -0500 Subject: [PATCH 1/6] Move coffee branch chain to the main branch to fix the uneaten baguette. --- levels/changing-the-past/rebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/levels/changing-the-past/rebase b/levels/changing-the-past/rebase index 812737c..6ed89a8 100644 --- a/levels/changing-the-past/rebase +++ b/levels/changing-the-past/rebase @@ -37,7 +37,7 @@ You do not have a donut." > you git add . git commit -m "You eat the baguette" -git checkout -b coffee +git checkout -b coffee main echo "You do not have a baguette. You have coffee. From d9b6165aa874fa4f59a34d43604f2808b6fd930c Mon Sep 17 00:00:00 2001 From: Mikko Reinikainen Date: Wed, 10 Mar 2021 08:17:26 +0200 Subject: [PATCH 2/6] Fix goal and congrats messages --- levels/stash/stash-branch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/levels/stash/stash-branch b/levels/stash/stash-branch index fa3f9fc..c9209f7 100644 --- a/levels/stash/stash-branch +++ b/levels/stash/stash-branch @@ -9,8 +9,6 @@ create a new branch from your stashed shanges. Just use If you just want to use the latest stash entry, you can leave the option empty. Create a new branch from the stashed changes! - -Clear you stash stack! --- tipp1 @@ -38,7 +36,7 @@ git checkout main [win] -# Did you clear your stash stack? +# Did you create a new branch from the stashed changes? test "$(git branch --list| wc -l)" -ge 2 [actions] @@ -47,4 +45,4 @@ test "$(git branch --list| wc -l)" -ge 2 [congrats] -All clear! :) +Stashed changes are in a new branch! :) From fd1a770a94b3ba0f9c4a728ce13038b44fcdc4fe Mon Sep 17 00:00:00 2001 From: Ben Donatelli Date: Thu, 11 Mar 2021 20:41:53 -0600 Subject: [PATCH 3/6] Simplify solution for level 'stash-merge' by adding recipe to index If recipe isn't part of index, user receives an error warning that local changes to file would be overwritten by merge when executing `git stash pop`. Since the focus of this lesson is learning about popping the stash, starting with recipe already added to index neatly sidesteps this error. --- levels/stash/stash-merge | 1 + 1 file changed, 1 insertion(+) diff --git a/levels/stash/stash-merge b/levels/stash/stash-merge index b11fed5..a8c9ac1 100644 --- a/levels/stash/stash-merge +++ b/levels/stash/stash-merge @@ -35,6 +35,7 @@ git stash push echo "- Pinch of Salt" >> recipe git checkout main +git add recipe [win] From c97993990599cb74cf26b9985a6bcb6987eee190 Mon Sep 17 00:00:00 2001 From: Martin Kunz Date: Sat, 20 Mar 2021 17:32:15 +0100 Subject: [PATCH 4/6] Fix: typo --- levels/stash/stash-branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/levels/stash/stash-branch b/levels/stash/stash-branch index fa3f9fc..bef5de2 100644 --- a/levels/stash/stash-branch +++ b/levels/stash/stash-branch @@ -4,7 +4,7 @@ cards = checkout commit-auto merge reset-hard [description] If you want to keep your changes but they don't belong to the main branch, you can easily -create a new branch from your stashed shanges. Just use +create a new branch from your stashed changes. Just use git stash branch If you just want to use the latest stash entry, you can leave the option empty. From d44c7d0d49bd92685ca91e3bc72377a66533070b Mon Sep 17 00:00:00 2001 From: blinry Date: Wed, 24 Mar 2021 14:55:10 +0100 Subject: [PATCH 5/6] Explicitly set pull.rebase = false, to avoid the long confusing warning Fixes #45. --- scripts/gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/gitconfig b/scripts/gitconfig index 19a86ae..a0dfd04 100644 --- a/scripts/gitconfig +++ b/scripts/gitconfig @@ -12,3 +12,5 @@ detachedHead = false [receive] denyCurrentBranch = ignore +[pull] + rebase = false From b5ca69264afef5cbb44f7edda23170c6469db925 Mon Sep 17 00:00:00 2001 From: blinry Date: Wed, 24 Mar 2021 15:38:53 +0100 Subject: [PATCH 6/6] On Windows, compare paths case-insensitively for the purpose of careful_delete Fixes #27. --- scenes/helpers.gd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scenes/helpers.gd b/scenes/helpers.gd index 28887f1..5e5cebc 100644 --- a/scenes/helpers.gd +++ b/scenes/helpers.gd @@ -96,6 +96,9 @@ func careful_delete(path_inside): expected_prefix = "/Users/%s/Library/Application Support/Oh My Git/tmp/" % OS.get_environment("USER") elif os == "Windows": expected_prefix = "C:/Users/%s/AppData/Roaming/Oh My Git/tmp/" % OS.get_environment("USERNAME") + # Windows treats paths case-insensitively: + expected_prefix = expected_prefix.to_lower() + path_inside = path_inside.to_lower() else: helpers.crash("Unsupported OS: %s" % os)