mirror of
https://github.com/git/git.git
synced 2026-08-08 17:11:48 +00:00
Dothem: let distclean run before switching to another revision
We run "make distclean" when --scratch is in effect, but that should be done using the current Makefile and set of sources before flipping to another branch.
This commit is contained in:
15
Dothem
15
Dothem
@@ -166,13 +166,6 @@ do
|
||||
|
||||
cd "$BUILDBASE/$branch"
|
||||
git reset --hard &&
|
||||
case "$(git symbolic-ref HEAD)" in
|
||||
"refs/heads/$branch")
|
||||
: ;;
|
||||
*)
|
||||
git checkout "$branch" &&
|
||||
git reset --hard || exit
|
||||
esac &&
|
||||
|
||||
case "$scratch" in
|
||||
'')
|
||||
@@ -185,6 +178,14 @@ do
|
||||
;;
|
||||
esac &&
|
||||
|
||||
case "$(git symbolic-ref HEAD)" in
|
||||
"refs/heads/$branch")
|
||||
: ;;
|
||||
*)
|
||||
git checkout "$branch" &&
|
||||
git reset --hard || exit
|
||||
esac &&
|
||||
|
||||
case "$private" in
|
||||
'')
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user