git 从 bash 脚本和终端签出的行为不同

Question

I am trying to do a regression test of my code using git and a bash script. So I have written a script to run a sample with the current version and with some previous version. The source files are located in "src" directory, and samples are in different "samples" directory. Both "src" and "samples" directories are tracked by git under same project.

I want to roll back only "src" files and no touch files in "samples". I have tried git reset and git checkout.

Problem: When I go to "src" in terminal and type:

git checkout -- *.F90

It does what is should - changes only Fortran files in this directory.

If I do the same command in a bash script, it changes everything: files "src" and in "samples", Like if it is run from the main directory. as "git checkout" or "git reset origin/master"..? How can it be?

Somewhere I have found suggestion to use "env -i" in a script, but it did not work either.

The whole script is about 500 lines, here is git related part:

cd $dsrc                   # go to src directory
ls                         # debuging, just to see , that I am there
git stash
git checkout origin/master -- *.F90

with ls command I do see the source files, I am in the right place.

Any ideas?

Answer 1

From the Git glossary for "pathspec":

[...] in particular, * and ? can match directory separators.

So *.F90 matches all .F90 files everywhere. To limit to the current directory, you could use

git checkout origin/master -- "$PWD"/*.F90

Notice that (as pointed out by torek in their comment) the manual refers to what Git does. If the shell can expand the glob first, it will – for example, if there are files in the current directory that do match *.F90 .

Only when there aren't any will Git get the unexpanded literal *.F90 and match the * with any prefix, including / . To prevent expansion by the shell, you could quote the glob:

git checkout origin/master -- "$PWD/*.F90"

or use . in the pathspec:

git checkout origin/master -- ./*.F90