gitblit
gitblit copied to clipboard
Unable to push master branch if the repository has "verify committer" enabled
This happens when we have commits of different developers.
[17:23] gilberto.andrade@BEM-INF007:gace (master u=) $ git merge --no-ff ticket/117
Merge made by the 'recursive' strategy.
pom.xml | 26 ++-
src/main/config/jasperreports/.classpath | 9 +
src/main/config/jasperreports/.gitignore | 1 +
src/main/config/jasperreports/.project | 37 ++++
src/main/config/jasperreports/.settings/com.jaspersoft.studio.prefs | 7 +
src/main/config/jasperreports/.settings/org.eclipse.core.resources.prefs | 3 +
src/main/config/jasperreports/DataAdapter.xml | 2 +
src/main/config/jasperreports/demonstrativo-financeiro-contrato.jrxml | 773 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/config/jasperreports/demonstrativo-financeiro-contrato_subreport.jrxml | 268 ++++++++++++++++++++++++
src/main/java/br/gov/to/bem/gace/service/JasperReportsService.java | 31 +++
src/main/java/br/gov/to/bem/gace/view/ContratoParcelaView.java | 18 +-
src/main/webapp/contratos/contrato-parcela-view.xhtml | 8 +-
src/test/java/br/gov/to/bem/infra/config/IreportBeanFactory.java | 120 +++++++++++
13 files changed, 1300 insertions(+), 3 deletions(-)
create mode 100644 src/main/config/jasperreports/.classpath
create mode 100644 src/main/config/jasperreports/.gitignore
create mode 100644 src/main/config/jasperreports/.project
create mode 100644 src/main/config/jasperreports/.settings/com.jaspersoft.studio.prefs
create mode 100644 src/main/config/jasperreports/.settings/org.eclipse.core.resources.prefs
create mode 100644 src/main/config/jasperreports/DataAdapter.xml
create mode 100644 src/main/config/jasperreports/demonstrativo-financeiro-contrato.jrxml
create mode 100644 src/main/config/jasperreports/demonstrativo-financeiro-contrato_subreport.jrxml
create mode 100644 src/test/java/br/gov/to/bem/infra/config/IreportBeanFactory.java
[17:23] gilberto.andrade@BEM-INF007:gace (master u+10) $ git status
On branch master
Your branch is ahead of 'origin/master' by 10 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
When pushing to remote ..
[17:23] gilberto.andrade@BEM-INF007:gace (master u+10) $ git push
Pass a valid window to KWallet::Wallet::openWallet().
Total 0 (delta 0), reused 0 (delta 0)
To https://srv-gitblit:8443/r/gace.git
! [remote rejected] master -> master (ad8ac7d4b5ea276f91604db231474ddbdb6d4493 by Whelmison de Melo Rodrigues <[email protected]> was not committed by Gilberto Caetano de Andrade (gilberto.andrade) <[email protected]>)
error: failed to push some refs to 'https://gilberto.andrade@srv-gitblit:8443/r/gace.git'
have you fixed it?
@Ryan-Miao @gitblit unfortunately not. I had to change from Restrict Push (Authenticated) to Restrict Clone & Push