Skip to content
Snippets Groups Projects

Update to ECA script to be smarter with reading in commits

Merged Martin Lowe requested to merge github/fork/autumnfound/malowe/master/27 into master

Change from using rev-list to cherry for list of commits. Will remove commits already tracked in default branch from checked commits. This should prove to be more accurate than rev-list which did not respect boundaries of branches/tree.

Includes fix for new line characters being randomly added to output after switch over to using hash objects to store commit data directly.

Signed-off-by: Martin Lowe martin.lowe@eclipse-foundation.org

Merge request reports

Approved by

Merged by Martin LoweMartin Lowe 4 years ago (Oct 7, 2020 3:37pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Maintainer

    This has been tested on staging in the current state:

    Origin (fork) push:

    [martin@martin-pc dash-gitlab-testing]$ git push origin-stage
    Enumerating objects: 8, done.
    Counting objects: 100% (8/8), done.
    Delta compression using up to 8 threads
    Compressing objects: 100% (3/3), done.
    Writing objects: 100% (4/4), 527 bytes | 527.00 KiB/s, done.
    Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
    remote: Non-Eclipse project repository detected: ECA validation will be skipped.
    remote: 
    remote: Note that any issues with sign off or committer access will be flagged upon merging into the main project repository.
    remote: 
    remote: ========================================================================
    remote: 
    remote:       THIS IS ONLY A TEST INSTANCE. DON'T DO IMPORTANT WORK HERE!
    remote: 
    remote: ========================================================================
    remote: 
    remote: To create a merge request for malowe/3, visit:
    remote:   https://gitlab-test.eclipse.org/malowe/dash-gitlab-testing/-/merge_requests/new?merge_request%5Bsource_branch%5D=malowe%2F3
    remote: 
    To gitlab-test.eclipse.org:malowe/dash-gitlab-testing.git
       5f2d9c7..94cf5d6  malowe/3 -> malowe/3

    Upstream push:

    [martin@martin-pc dash-gitlab-testing]$ git push upstream-stage HEAD
    Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
    remote: Commit: 94cf5d6ad2d4693b6db86d609dd1d66ed8178a90		X
    remote: 
    remote: 	Reviewing commit: 94cf5d6ad2d4693b6db86d609dd1d66ed8178a90
    remote: 	Authored by: Martin Lowe <martin.lowe@eclipse-foundation.org>
    remote: 	The author is not a committer on the project.
    remote: 	The author has a current Eclipse Contributor Agreement (ECA) on file.
    remote: 	The author has not "signed-off" on the contribution.
    remote: If there are multiple commits, please ensure that each commit is signed-off.
    remote: 
    remote: Errors:
    remote: GL-HOOK-ERR: The contributor must "sign-off" on the contribution.
    remote: Any warnings or errors noted above may indicate compliance issues with committer ECA requirements. More information may be found on https://www.eclipse.org/legal/ECA.php
    remote: 
    remote: 
    To gitlab-test.eclipse.org:eclipse/dash/dash-gitlab-testing.git
     ! [remote rejected] HEAD -> malowe/3 (pre-receive hook declined)
    error: failed to push some refs to 'gitlab-test.eclipse.org:eclipse/dash/dash-gitlab-testing.git'

    Git Log:

    commit 94cf5d6ad2d4693b6db86d609dd1d66ed8178a90 (HEAD -> malowe/3, origin-stage/malowe/3)
    Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
    Date:   Mon Oct 5 09:24:26 2020 -0400
    
        no sign off for real
    
    commit 0f18ce453206d0175afea0d4535d14bccceb5cfa (upstream-stage/master)
    Merge: 971cf96 5f2d9c7
    Author: Eclipse Foundation Webdev <webdev@eclipse.org>
    Date:   Mon Oct 5 09:20:08 2020 -0400
    
        Merge branch 'malowe/3' into 'master'
        
        Malowe/3
        
        See merge request eclipse/dash/dash-gitlab-testing!5
  • Review: Approved

    LGTM

  • Christopher Guindon approved this merge request

    approved this merge request

Please register or sign in to reply
Loading