branch cleanup bug in nightly build script

[cwsmith]

The cdash/nightly.cmake script is failing when a branch is created (develop-into-master, IIRC) but isn't deleted correctly so that in a subsequent run the command to create the branch fails. Here was my last failed attempt to fix it 3ec5a12 .

[cwsmith]

A partial error log is below:

Submitted develop results to CDash
Running "git checkout master"
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Checking out branch master succeeded
Running "git pull --ff-only"
Already up to date.
Fast-forward pulling master succeeded
Running "git checkout develop"
Switched to branch 'develop'
Your branch is up to date with 'origin/develop'.
Checking out branch develop succeeded
Running "git pull --ff-only"
Already up to date.
Fast-forward pulling develop succeeded
Attempting to delete develop-into-master if it exists
fatal: not a git repository (or any parent up to mount point /lore)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
git branch --list returned: 128)!
develop-into-master exists.  Attempting to delete it.
Running "git branch -D develop-into-master"
error: branch 'develop-into-master' not found
CMake Error at /lore/smithc11/nightlyBuilds/nightly.cmake:89 (message):
  Deleted develop-into-master.  failed (code 1)!
Call Stack (most recent call first):
  /lore/smithc11/nightlyBuilds/nightly.cmake:103 (git_exec)
  /lore/smithc11/nightlyBuilds/nightly.cmake:242 (remove_branch_if_exists)
  /lore/smithc11/nightlyBuilds/nightly.cmake:300 (start_merge)
  /lore/smithc11/nightlyBuilds/nightly.cmake:352 (try_merge)


+ touch /lore/smithc11/nightlyBuilds//doneCoreNightly
+ cd build/master
+ make doc

[Sichao25]

Just a thought—would it be better to add WORKING_DIRECTORY to the execute_process call at line 98, since the error message includes fatal: not a git repository (or any parent up to mount point /lore)? I feel like ${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME} is being treated as an argument to the git branch command. I'm not sure if that's the intended behavior.

[cwsmith]

Good call. That appears to have fixed it. Thank you 👍

e4044b5

[cwsmith]

it is failing again

Submitted develop results to CDash                                                                                                     
Running "git checkout master"                                                                                                          
Switched to branch 'master'                                                                                                            
Your branch is up to date with 'origin/master'.                                                                                        
Checking out branch master succeeded                                                                                                                                                                                                                                           
Running "git pull --ff-only"                                                                                                           
Already up to date.                                                                                                                    
Fast-forward pulling master succeeded                                                                                                  
Running "git checkout develop"                                                                                                         
Switched to branch 'develop'                                                                                                           
Your branch is up to date with 'origin/develop'.                                                                                       
Checking out branch develop succeeded                                                                                                  
Running "git pull --ff-only"                                                                                                           
Already up to date.                                                                                                                    
Fast-forward pulling develop succeeded                                                                                                 
Attempting to delete develop-into-master if it exists                                                                                  
fatal: not a git repository (or any parent up to mount point /lore)                                                                    
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).                                                             
git branch --list returned: 128)!                                                                                                      
develop-into-master exists.  Attempting to delete it.                                                                                  
Running "git branch -D develop-into-master"                                                                                            
error: branch 'develop-into-master' not found                                                                                          
CMake Error at /lore/smithc11/nightlyBuilds/nightly.cmake:89 (message):                                                          
  Deleted develop-into-master.  failed (code 1)!                                                                                       
Call Stack (most recent call first):                                                                                                   
  /lore/smithc11/nightlyBuilds/nightly.cmake:103 (git_exec)                                                                            
  /lore/smithc11/nightlyBuilds/nightly.cmake:242 (remove_branch_if_exists)                                                     
  /lore/smithc11/nightlyBuilds/nightly.cmake:300 (start_merge)                                                                         
  /lore/smithc11/nightlyBuilds/nightly.cmake:352 (try_merge)                   

[Sichao25]

I found that git branch --list returns exit code 0 regardless of whether the branch exists or not. So, if we plan to use it, we’ll need to manually check its output instead of the return value. I think other alternatives like git show-ref --quiet refs/heads/$name might make more sense.