Skip to content

Commit 4bd7660

Browse files
committed
ever-green: determine GIT_DIR correctly again
A recent change in `git rebase` stopped setting `GIT_DIR` when running the `exec` commands in th todo list. However, the `ever-green.sh` script relied on it. Let's shell out to Git to determine the Git directory correctly again. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 5a2c83a commit 4bd7660

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ever-green.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ nested-rebase)
205205
if test -n "$merging"
206206
then
207207
cat >>"$todo" <<-EOF
208-
exec git merge -s ours -m "\$(cat "\$GIT_DIR/merging-rebase-message")" "$merging"
208+
exec git merge -s ours -m "\$(cat "\$(git rev-parse --git-dir)/merging-rebase-message")" "$merging"
209209
exec git replace --graft HEAD HEAD^
210210
exec exit 123 # force re-reading of replacement objects
211211
EOF
@@ -817,7 +817,7 @@ then
817817
if test -n "$merging"
818818
then
819819
cat >>"$replace_todo" <<-EOF
820-
exec git merge -s ours -m "\$(cat "\$GIT_DIR/merging-rebase-message")" "$current_tip"
820+
exec git merge -s ours -m "\$(cat "\$(git rev-parse --git-dir)/merging-rebase-message")" "$current_tip"
821821
exec git replace --graft HEAD HEAD^
822822
exec exit 123 # force re-reading of replacement objects
823823
EOF

0 commit comments

Comments
 (0)