Why `git checkout -` works differently in a Makefile?

Question

I have such a beautiful target in my Makefile which works in bash without a problem. git checkout - should checkout a previous branch, but it doesn't, it stays in that develop branch and that's it, while executing this in bash it works well. Do I have bad if statement maybe? In Makefile you need to you double dollar sign in order to have a bash subcommand right?

SHELL := /bin/bash rebase: git stash git checkout develop git pull --rebase origin develop if [ $$(git status --porcelain | wc -l) -lt 1 ]; then \ git checkout -;\ git rebase develop;\ git stash apply;\ fi;

you could add some echo to the if block to rule out shell logic issues — max630
– max630, Commented Apr 9, 2018 at 4:28
You right - it was one file which haven't been added anywhere and it was untraced one, so I've added git stash --include-untracked — holms
– holms, Commented Apr 9, 2018 at 5:14
Note: git config pull.rebase true; git config rebase.autoStash true can be of interest here: no need for stashing: stackoverflow.com/a/30209750/6309 — VonC
– VonC, Commented Apr 9, 2018 at 7:39

VonC · Accepted Answer · 2018-04-09 11:32:20Z

1

If the '-' is somehow misinterpreted, try the alternative syntax @{-1}.

Both are mentioned here.
The if/then shell syntax used in Makefile seems correct.

edited Apr 9, 2018 at 11:32

answered Apr 9, 2018 at 4:28

VonC

1.4m569 gold badges4.8k silver badges5.7k bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

Tim Over a year ago

Not sure I interpreted the last part correctly but the if/then/fi syntax has nothing to do with GNU make, it's shell syntax.

VonC Over a year ago

@Tim Yes, I meant the "shell syntax used in that Makefile". I have edited the answer.

Collectives™ on Stack Overflow

Why `git checkout -` works differently in a Makefile?

1 Answer 1

2 Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Linked

Related