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.

Filter by
Sorted by
Tagged with
1
vote
1answer
38 views

Azure deploy pipeline with/without approval on separated enviroments

I have two separate environments under my repository: development (Approvals are not configured but the environment exists) production (Approvals rules are configured via dev.azure.com UI) The ...
0
votes
2answers
56 views

Jenkins: Re-use repository with reference option and do changes on it

I would like to setup a Jenkins cluster where the slaves are building an Android ROM with some parameters like branch (e.g. lineage-16.0) and some optional patches. The whole repository will consume ...
0
votes
0answers
21 views

Any prior art for building deployment consensus in $USER/$feature git branches?

Does anyone know of a name for the practice of maintaining $USER/$feature branches, or any discussion of git flows that use that pattern? We're experimenting with a workflow that involves each team ...
10
votes
4answers
29k views

How to resolve merge conflicts in Azure DevOps current UI

I have followed the instructions on command line: https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio all I want to do is resolve this merge ...
0
votes
1answer
27 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&...
2
votes
1answer
36 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 ...
1
vote
0answers
51 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 ...
1
vote
2answers
483 views

Jenkins trigger build if shared library changes

I have Jenkins Pipeline job define in my git repo as. // File: deployment/jenkinsfiles/staging/Merge @Library("my_shared_lib") _ import com.company.myteam.Constants pipeline { agent { label "...
0
votes
0answers
24 views

Best way to organize e2e testing in separate environment without intervention to stable development process

Hello DevOps community! TL;DR What are your cases where you integrated cypress end-to-end testing to your project? What are the best approaches? Pitfalls? Long story... I got the QA engineer asking me ...
1
vote
1answer
34 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 ...
1
vote
0answers
15 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 ...
1
vote
1answer
67 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?
0
votes
0answers
21 views

Azure DecOps push to GitLab

Within Azure DevOps I am trying to create a Command Line Script which is pushing the actual DevOps Repo to GitLab. git clone https://xxxx@dev.azure.com/xxxx/DBS/_git/xxx git remote add --mirror=fetch ...
0
votes
1answer
51 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 ...
2
votes
1answer
77 views

Commit messages from Submodules to Jenkins Change Log

I have a project with 3 submodules that are updated whenever that project is built and the project is built mainly for an installer (which is not in a submodule). Not a lot of changes are made in the ...
1
vote
2answers
35 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 ...
0
votes
1answer
117 views

Best practices to maintain forks of Git repository in an on-prem Azure DevOps Server

We have an on-premises Azure DevOps Server and like to use the Git workflow "Fork-Clone-Push-PR". In the moment of forking the system let allow us decide into which project and under which ...
6
votes
3answers
77 views

How long is it appropriate to keep old feature branches in git?

I am on a large team with many developers. We have a large codebase that has many feature branches from our large group of developers. We are accumulating many feature branches. We generally look to ...
2
votes
1answer
407 views

Does GitHub support VFS for Git?

NOTES: I really hope that this question hasn't been asked before and as far as I know, only Azure DevOps Service (Azure DevOps on cloud) and Azure DevOps Server 2019 (Azure DevOps on-premise) fully ...
0
votes
0answers
13 views

Managing multiple “staging” branches in a git workflow

We're creating a migration workflow to move from SVN to Git, and we've hit a particular snag that is increasing the complexity of the proposed workflow. Some basic base for what we do in our current ...
0
votes
0answers
15 views

Setting up PR Build in Jenkins when raised from stash

Setting up a PR request to have a build run in Jenkins. Our source repository is Stash. Essentially, the PR will be from any branch (each developer will create their own branches) to develop I have ...
1
vote
0answers
24 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 ...
1
vote
1answer
48 views

Git feature branching strategy allows unapproved 'tag along' features

Context Our current operations consists of three servers: QA is a playground for devs to try out new features; Platform is the live customer facing application; Mock is a copy of Platform and ...
0
votes
1answer
68 views

How to get branch hash using git command

I have JenkinsFile where I'm trying to get the hash for my current branch. I saw this post: https://stackoverflow.com/questions/9110478/how-to-find-the-hash-of-branch-in-git but when I tried to run ...
0
votes
0answers
91 views

getting error in Jenkinsfile - command not found

I'm trying to setup my company's first CI/CD pipeline, to build & deploy docker containers in gke, it has been a a great learning curve so far, however I'm stuck with error in Jenkinsfile /var/lib/...
2
votes
1answer
48 views

Pass information between Jenkins Job builds

Please excuse my non-fluent terminology.. There is a Jenkins server, master and a few slaves, there is a pipeline job.. let's call it playground I run the job once, I want to save some data somewhere. ...
0
votes
0answers
15 views

Trunk based (or similar) development, and small commits that depend on each other

I'm not sure if trunk-based development is strictly the right term here, but let me outline the process. Say I have some code like: //utils.js function someFunction(foo, bar) { //implementation } ...
7
votes
2answers
2k views

What is the exact use of DETACHED HEAD state in Git?

When I checkout a specific commit hash, it goes to detached mode where HEAD POINTER can't point to a recent commit. What are the things we can do and what is the use of going detached head state in ...
2
votes
3answers
3k views

Is there a way to use a Jenkinsfile from a git-submodule in a multibranch pipeline?

Background: The nature of our project's source involves multiple long-living branches, each one has its own Jenkins job (manually created). Multibranch limitation: Unfortunately we do not use a ...
1
vote
1answer
40 views

Is there any other approach for tagging git branch using pipeline without credentials in pipeline code?

I was trying to tag a git branch using Gitlab CI. With the help of this answer from this community, How to tag source code using gitlabCI I can successfully tag a git branch from Gitlab CI pipeline. ...
0
votes
0answers
11 views

How to backup an Asterisk configuration with git?

How would I use git or similar version control software to backup the configuration for an Asterisk VoIP SIP server? see also: https://en.wikipedia.org/wiki/Asterisk_(PBX) https://support....
0
votes
1answer
536 views

Jenkins Not pulling the latest commit into master or slave

I have a Jenkins pipeline where after every build I change a file(increase build version in a property file) and checkin back to the git repository. After a build, I commit some differnt code change ...
0
votes
1answer
43 views

git reflog is showing plain text password used

We are using Jenkins Freestyle Project to push the changes on the remote server. We are executing shell script on remote host using ssh for it. To pull the changes on remote host, we are using origin ...
3
votes
1answer
129 views

Dedicated/Separate Git Repo as Terraform Remote Backend

I see that there are multiple options for Backends, however git isn’t one of them. I believe git can be used as a backend for tfstate, in the below steps: Create a dedicated git repo Commit the ...
4
votes
1answer
794 views

Heroku Slack integration without using Github

Heroku has this great Slack chatbot (chatops) that lets you send messages if a deployment pipeline succeeded or failed. Unfortunately, while setting it up and logging in to Heroku, it asks for your ...
1
vote
1answer
69 views

What's in THIS environment?

We work on multiple java web projects going on at the same time and those are all being tested on several different QA environments. I'd like to show on our support portal what projects are in what ...
2
votes
1answer
53 views

Is it possible to view all changes made on a Git feature branch in Azure Devops?

Azure DevOps offers the overview of changes made in a branch when a PR is created. However, sometimes I'd like to have access to that overview when viewing a branch without the need to create a PR (or ...
3
votes
1answer
23 views

How to push to other origins using Azure Pipelines?

Inspired by Necessity of mirroring git repos for small team considering switching to Azure: How does one use Azure Pipelines to push changes to a secondary/backup origin on push? Possible use cases: ...
3
votes
1answer
479 views

Using Azure Devops with Git Workflow

I have used Azure Pipeline for CI/CD on various small projects that I have worked and it has been a great experience. I am working now on a decent size project that has a web app, mobile(xamarin) app ...
3
votes
2answers
94 views

What is the way to update images in a configuration git repository when doing gitops?

i'm trying to do gitops I have a Configuration repo containing k8 manifests and different app repos. 1) App repo's CI build docker images and pushes into registry. 2) App repo's CI commits into ...
1
vote
1answer
45 views

Continuous deployment

I have a nodejs application using expressjs. This server is handing a website built on vuejs, an application using angular and another angular app. Everything is working and I deployed to AWS eb using ...
1
vote
0answers
38 views

How to prevent changes without Jira ID

Some times we can push changes without Jira ID. I want to prevent changes without mentioned `Jira ID'. Suppose projects named like: abc, def, ghi And have Jira ID's like: 1234-abc, 2525-def, and ...
5
votes
1answer
3k views

jenkins fatal: ambiguous argument, unknown revision or path not in the working tree

In jenkins pipeline, execute git command : git log --format=%B --no-merges origin/master..origin/${currentBranch} jenkins output error : fatal: ambiguous argument 'origin/master..origin/XOPS-...
3
votes
1answer
127 views

Necessity of mirroring git repos for small team considering switching to Azure

Question: Are there any benefits to mirroring our git repos outside of Azure devops for a small (~7) team of developers who all work in the same office? Background Information I'm a developer ...
2
votes
1answer
78 views

Branching model for nightly deploys

I'm a lead developer for a small B2B SaaS company, using Django and AWS. We currently run biweekly deploys after hours with a mostly-automated custom Fabric-powered tool. We're currently exploring ...
3
votes
1answer
156 views

What approach should I take to store environment variables for a repo?

I am setting up a new infrastructure as code repository for a small to medium size project. The problem I am currently trying to solve is how to store my environment variables such that they can be ...
5
votes
1answer
100 views

How to keep many servers (5000+) up-to-date?

Initially asked here: https://stackoverflow.com/questions/60674502/how-to-keep-many-servers-5000-up-to-date-with-git-and-its-rate-limits The initial post: We're making a php service that will run on ...
30
votes
5answers
16k views

Where to put ansible-vault password

We are planning to use ansible vault in our project to prevent leaking passwords or keys in git. The idea is to put all our sensitive data into a plain file then encrypt this file with ansible-vault ...
0
votes
2answers
2k views

Why can't I connect to Gitea using ssh via command line?

My computer: Windows 10 Pro 1909 I have a Gitea server running in my office, at local IP address 10.100.10.24, with SSH configured on port 22000. Gitea is configured to use port 3000 for HTTP. I'm ...
0
votes
1answer
101 views

exponential backoff for git pushes?

We've got a ton of jobs in our Jenkins that all do git pushes, sometimes simultaneously. Unsurprisingly, if two jobs try to push at the same exact time, one will succeed while the other fails. My knee-...