Questions tagged [git]
Use this tag for questions about Git, a free and open source distributed version control system, related to using Git for topics such as continuous delivery, monitoring, building SDLC infrastructure, etc.
189
questions
0
votes
2
answers
48
views
How to organize Gitflow releases with multiple environments for web application?
We use gitflow branching strategy for different reasons, one of them being complicated bureaucracy around releases.
We have environments: dev, qa, preprod, prod.
Once the developers finish their work ...
- 101
0
votes
0
answers
16
views
How to make each user run with its own credentials in my local Git?
I have a local git version control installed on RedHat 8 server.
When I run git add *, it asks me to provide the sudo permissions which is sudo git add *. This makes the add run with the root for me. ...
0
votes
1
answer
18
views
What is the difference between The Shared repository model and fork and pull model?
I am trying to understand what is the difference between the two.
The Shared repository model: uses ‘topic’ branches, which are reviewed, approved, and merged into the main branch.
Fork and pull model:...
- 103
0
votes
3
answers
75
views
Estimate storage space for a git server
How to estimate the space a git repository will take on a source version control server?
For example, given k commits every day, with x kB of code per commit, my repository will take n GB of server ...
0
votes
1
answer
129
views
Why is Azure Repos Git Checkout sometimes returning a Status code 128?
We've migrated from a on premise GitBlit to Azure DevOps last week.
Our builds are now suffering from periodic error while cloning the git repo. See example output. Main error is probaby returned ...
- 103
0
votes
1
answer
2k
views
Is there a way to avoid deleting a branch in Azure DevOps without obliging pull requests?
In Azure DevOps, configuring a branch policy ensures the branch cannot be deleted. However this also obliges to use pul requests to make changes to that branch.
Currently we are not using pull ...
- 103
0
votes
1
answer
246
views
Is there a way to increase Rate limits on Azure DevOps?
We were using an on premise Jenkins against an on premise GitBlit. This worked fine. Last week we migrated from GitBlit to Azure DevOps.
Our Jenkins Jobs now run with the PAT of a 'fake' Azure Account ...
- 103
0
votes
0
answers
141
views
is it possible to get web application url from branch without publishing it?
When working on the task we create git branch (AzureDevOps). In this branch we modify code in VS and can run web application on localhost. When it's done we commit changes and create PR. To test it ...
- 101
2
votes
0
answers
38
views
Jenkins build fails when no commits in the code (ChannelSftp.throwStatusError)
I have built a jenkins pipeline for executing a test on a windows server. Once the automated test report is generated on the windows server, it ships that report to a different server.
There are ...
0
votes
0
answers
155
views
Azure DevOps Build Validation of other repo's pipeline: "while loading the YAML build pipeline. Object reference not set to an instance of an object."
This (nearly empty) Azure DevOps pipeline yaml fails when initiated because of a PR from another repo's Build Validation:
azure-pipelines.yaml of "App A":
pool:
name: default
steps:
- ...
- 101
0
votes
1
answer
1k
views
Why don't I see conflicts in git, but ADO shows conflicts, and how to fix this?
I have already read
How to resolve merge conflicts in Azure DevOps current UI but nothing there helped.
Also, no, I cannot use "Pull Request Merge Conflict Extension", I am not the admin of ...
- 101
0
votes
0
answers
43
views
Deploying files contains in a git repo to a docker container
I have a stack deployed using a docker-compose file.
Some of the containers will need to retrieve and host files located in a git repo (gitlab), what is the best way to retrieve / copy files from the ...
- 344
1
vote
1
answer
179
views
Can you delete project binaries from an Azure Devops repo
I have an existing repository in Azure DevOps that is currently tracking various /obj, /bin files (.dll, .pdb, .cache, etc.). I don't want to track these anymore; however I am worried that if I delete ...
- 13
1
vote
0
answers
713
views
Auto-merge merge conflicts of specific files in AzureDevops
We are using self-hosted Azure DevOps to manage our git repositories, and the "Pull Request Merge Conflict Extension" by Microsoft DevLabs. When submitting pull requests, there often are ...
- 111
3
votes
1
answer
54
views
Gathering timespan statistics from Git
I would like to easily query git to answer a question like the following:
How much time passed from when a developer made a git commit to when that commit was merged to a default branch from a feature ...
- 153
1
vote
0
answers
778
views
Best practice for building releases with Jenkins multibranch pipeline
We have started moving from Subversion to git (using Bitbucket, to be exact), and I'm unsure how to manage release builds with the multibranch concept.
This is how we do it in Subversion:
We have one ...
- 111
2
votes
0
answers
267
views
Complete automatic release process (with versioning) on a multibranch pipeline?
We have projects that once in a while need to be released with all the changes already present in the develop branch. Every time we make a new release, we update the code with the new release version ...
- 121
0
votes
1
answer
111
views
What is manual, what is automatic in Continuous Delivery?
I've read lots of articles about the concept on the internet. I thought I got it, but some statements in other articles make me confused.
In order to simplify and clarify things, I'll presume I use ...
- 101
3
votes
1
answer
2k
views
How to ansible-vault files as they are commited to Git
I'm trying to use ansible-vault to secure the secret files in my project before I push them to Git.
There's loads of advice out there on how to set this up in part, but everything I've read is ...
- 181
1
vote
1
answer
6k
views
Jenkins checkout GitSCM and git step how does it work internally and why
When I execute my pipeline and I go and see on the actual Jenkins slave, the checked out commit doesn't have latest changes. But the logs and actual files in the workspace on the Jenkins slave running ...
- 111
0
votes
1
answer
451
views
bitbucket pipeline to push commits to another repo
So this is the scenario i have right now, we have a repo (boilerplate) that contains our infrastructure code, docker files, and pipeline scripts, each time we create a new project we copy this repo to ...
2
votes
3
answers
94
views
Is the forking git workflow used outside of open source projects?
Here is the Forking workflow if you're not familiar with it.
The company I work for is mostly comprised of historically open source developers. This has caused them to be stuck on the forking workflow ...
- 25
0
votes
1
answer
61
views
How can I create a dev. environnement using Azure DevOps?
I'm not sure if it's the right place to ask this question. So let me know, if it's not.
I'm building a front end app with VueJs. I actually use 2 computer. I use the first computer as a "server&...
- 103
1
vote
1
answer
606
views
How can you do pre-merge testing in trunk based development?
Currently, we use a simple branching strategy, with a single main branch and one layer of feature branches; no branches on branches on branches. We also have many pipelines that run against each PR to ...
- 251
0
votes
1
answer
3k
views
Create a folder in slave node using Jenkins pipeline groovy script
I have a Jenkins job which runs on a slave node on another machine, both master and slave run on windows. The slave node is being run as a windows service. The main repository has git submodule ...
- 11
2
votes
0
answers
105
views
Jenkins declarative pipeline with mvn, releases and versioned artifactory
We have a requirement to support human defined versions (not auto generated) for patch releases. I'm trying to figure out a way to do this in Jenkins.
We have:
BitBucket, Jenkins, Nexus/JFrog (either)...
- 121
1
vote
0
answers
257
views
How to get merge request stats using Git CLI command?
I needed to get the final stats on a sample Merge Request with multiple commits on it.
I have tried pulling in git ls-remote origin 'refs/merge-requests/*/head' then trying to get insertion and ...
- 21
1
vote
1
answer
2k
views
How to get all open Merge Requests using git command line?
I need to get all open Merge requests by author and if possible within a time frame. Tried using this command for Github where it works fine -
git ls-remote origin 'pull/*/head'
But in gitlab, this ...
- 21
1
vote
1
answer
706
views
How do I configure my AWS SSO-managed user with my public SSH key?
My AWS identity is SSO-managed, not an IAM user.
I wish to upload my public SSH key (so as enable client UI access to CodeCommit) but am not the AWS account/organisation admin so cannot see what the ...
- 111
0
votes
1
answer
748
views
how to pull only git logs without pulling the whole file tree and diffs
I have a server that has limited storage space and I need to track a git repository, but I am only interested in the log messages and not the whole repository (blobs, diffs, tags, ...). the repository ...
- 101
2
votes
2
answers
85
views
How to incorporate feedback from pull request
I am new to bitbucket. I tried to google it but unable to find exact answer for my question.
I created a feature branch. Made few changes in the feature branch then I pushed/committed all the changes ...
- 21
1
vote
2
answers
3k
views
Git keeps asking for ssh passphrase when SSH is already defined in GitLab
I'm playing around with a personal GitLab account to get familiar with its' ins and outs. First, I followed this primer on setting ssh keys and added public and private ED25519 keys to ~\.ssh. I added ...
- 111
2
votes
0
answers
50
views
How to push large codebase to lots of servers
I am currently creating a concept for a multi-stage release pipeline using Azure DevOps release pipelines. The software stack that should be deployed is a rather bulky PHP application that uses lots ...
- 121
0
votes
0
answers
96
views
Restricting one module for one tf file
So I have file called main.tf in which I am calling the existing module for iam_role, but in same main.tf I have called one more module for service_role but I want to restrict that service_role module ...
- 1
1
vote
2
answers
160
views
How to track deployments of multiple interconnected repositories
We are working with a ERP system (called Odoo, but that does not matter so much).
It consists of many building blocks. Some of this modules/addons are dependent on others, some are standalone, but ...
- 111
1
vote
0
answers
56
views
git-p4 rebase command fails when using "main" as the default git branch
I'm using the git-p4 script (doc reference, code reference) to drive some processes to synchronize code stored in Perforce Helix in to GitLab. It works fine for my needs, though now that GitLab ...
- 201
0
votes
1
answer
253
views
Gitlab build from multiple repositories - git submodules
I have gitlab repo ZERO (project) which serves as a code base for multiple websites (repo ONE, TWO, THREE..), these are also gitlab repositories. I am using gitlab CI/CD options, I want to be able to ...
- 1
1
vote
1
answer
4k
views
Using a conditional environment{ } directive in Jenkinsfiles
My Jenkinsfiles use the environment{} directive. I've been trying to set a condition where I invoke different variables depending on the GIT branch being builded.
I've tried something like e. g. :
...
- 43
2
votes
2
answers
1k
views
One or multiple git repositories for independent small parts of one larger project?
We are developing an Azure-based analytics platform that consists of several modules. Among other things, Azure functions, scripts for creating the infrastructure and scripts for initialising the ...
- 21
0
votes
1
answer
6k
views
Jenkins: Dynamically git clone only the files required for a particular job from a monorepo
We have a huge ~20GB monorepo. For a particular Jenkins job, we do not need to clone the entire repo but only need a few sub-directories.
The solution for this is of course git sparse checkout. ...
- 101
0
votes
1
answer
44
views
When do I run applications on a server in a pod and when to run them directly on the base operating system?
I am trying to get started in the DevOps Field by setting up a small server currently with Virtualbox, later on for a small team. For my basic setup I plan to use gitea as self-hosted git and Jenkins ...
- 101
0
votes
1
answer
1k
views
Jenkins Docker - Make changes to gitconfig
I have a self-hosted Gitea organization, and the way to access the repos requires some "secret" extraheader in .gitconfig. (2FA is also enabled)
When I look at Jenkins "Configure System&...
- 103
2
votes
1
answer
50
views
Is there a better model for my CI/CD cycle?
I am having some troubles finding a better model for my CI/CD cycle.
This is mainly gitflow issue.
My current model : We have 2 bitbucket branches : master and develop.
Both are linked via webhooks to ...
- 21
2
votes
1
answer
837
views
Azure Devops - workflow/strategy for uploading only changed files to shared hosting provider after a build of static website (Jekyll)
Scenario:
I'm using the Ruby/Jekyll build process to generate a static website from markdown etc files via a templating process -- the same flow as the one used by Github Pages but instead of hosting ...
- 123
2
votes
1
answer
167
views
How to test pipeline changes in Azure?
I currently have a pipeline in Azure which consists of a bunch of YAML which eventually calls some terraform script to handle the deployment side.
What is the best way to handle dev testing of changes ...
- 121
1
vote
0
answers
159
views
Monorepo manifests image tag replacement in Github Actions
I have a mono repo with NodeJS app (or better said, components of an app).
There are 3 apps in the repo, each has its own directory and Dockerfile:
/core
/worker
/frontend
There’s also /deployments ...
- 111
1
vote
1
answer
7k
views
Can you remove a commit made to a branch on AWS code commit?
I know of git rebase but don't know if it can be used with AWS code commit?
Or if there's any other method of removing a commit to revert back to before it was made and merged?
- 513
3
votes
1
answer
2k
views
How to skip reviewer for project administrator pull request?
Is it possible to configure the repository to skip "At least one reviewer must approve the most recent iteration" in case the person who performs the Pull request is the project ...
- 133
1
vote
2
answers
554
views
Command "git [command] --help" opens as HTML in my code editor - no output to terminal. How do I revert to default behavior?
When I type git reset --help I don't get output in the bash terminal, but a new tab opens in my code editor to reveal some dense HTML. How can I change Git's behavior to display the help message in ...
- 11
1
vote
1
answer
63
views
Azure DevOps issue with GIT, Visual Studio and Azure (Umbraco)
I am completely new to Visual Studio, .net and Azure DevOps
I have a problem with GIT using the GIT bits (rather than CMD), in Visual Studio
I have a .Net application (Umbraco), that has been built ...
- 11