[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] Deploy branch, not master



Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

1 changed file:

Changes:

  • config/debian/deploy.functions
    ... ... @@ -7,7 +7,7 @@ function fetch_updates() {
    7 7
     function find_commitids() {
    
    8 8
         cd ${masterdir}
    
    9 9
         OLDHEAD=$(git rev-parse HEAD)
    
    10
    -    NEWHEAD=$(git rev-parse origin/master)
    
    10
    +    NEWHEAD=$(git rev-parse origin/deploy)
    
    11 11
     }
    
    12 12
     
    
    13 13
     function check_commit_signature() {
    
    ... ... @@ -26,7 +26,7 @@ function check_commit_signature() {
    26 26
     function check_for_db_update() {
    
    27 27
         # Check: Do we have a DB Upgrade?
    
    28 28
         if [[ -n ${NEEDDB} ]]; then
    
    29
    -        NEWDBVER=$(GIT_TREE=${masterdir}/.git git ls-tree origin/master dak/dakdb/update*.py|sort -V -k 4|tail -n 1)
    
    29
    +        NEWDBVER=$(GIT_TREE=${masterdir}/.git git ls-tree origin/deploy dak/dakdb/update*.py|sort -V -k 4|tail -n 1)
    
    30 30
             NEWDBVER=${NEWDBVER##*update}
    
    31 31
             declare -r NEWDBVER=${NEWDBVER%%.py}
    
    32 32
         fi
    


  • Reply to: