go-gitea/git
1
0
Fork 0
mirror of https://github.com/go-gitea/git.git synced 2026-07-19 14:33:37 -04:00
Code Issues 12 Packages Projects Releases Wiki Activity

[PR #85] [CLOSED] Add (*Repository).MergeBranch and (*Repository).MergeCommit #91

New Issue
Closed
opened 2026-02-16 10:24:05 -05:00 by yindo · 0 comments
yindo commented 2026-02-16 10:24:05 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/go-gitea/git/pull/85
Author: @typeless
Created: 9/26/2017
Status: ❌ Closed

Base: master ← Head: support-merging-bare-repo

📝 Commits (10+)

📊 Changes

5 files changed (+331 additions, -2 deletions)

View changed files

📝 Makefile (+1 -0)
📝 command.go (+10 -2)
➕ repo_merge.go (+116 -0)
➕ repo_merge_test.go (+94 -0)
➕ testdata/generate.sh (+110 -0)

📄 Description

Support branch mering for bare repository

TODO:

  1. More reliable result validation (or better testing strategy).
  2. Test merging with conflict.
  3. Test merging with added files.
  4. Support different options (e.g. --squash --no-ff --ff-only)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/git/pull/85 **Author:** [@typeless](https://github.com/typeless) **Created:** 9/26/2017 **Status:** ❌ Closed **Base:** `master` ← **Head:** `support-merging-bare-repo` --- ### 📝 Commits (10+) - [`c448877`](https://github.com/go-gitea/git/commit/c448877590f6095347e125a2eed0b9a1c2f2876a) Add (*Repository).MergeBranch and (*Repository).MergeCommmit - [`2b024a4`](https://github.com/go-gitea/git/commit/2b024a4a6c00f2a0fe4fdf30aeb14f8b4326cdb2) Add repo-conflict - [`526ce1d`](https://github.com/go-gitea/git/commit/526ce1db7f90df2b52c890dff897bf17c49cf0dd) Fix comment - [`bd6fae5`](https://github.com/go-gitea/git/commit/bd6fae5d77b802149266d686220ba4d418de17ee) Remove mistaken test data - [`f3e09b4`](https://github.com/go-gitea/git/commit/f3e09b4c9fa30af875e69544872a94f62db8337e) Change the expected commit oid for TZ=UTC - [`9825143`](https://github.com/go-gitea/git/commit/98251433c4c3f20046f9cf208e0fe741c85ab235) Add generate.sh - [`ae69b43`](https://github.com/go-gitea/git/commit/ae69b43bd720137ae1450819f73172255185cdc3) Remove old testdata - [`1f5f5cf`](https://github.com/go-gitea/git/commit/1f5f5cf602d27e550af9a88f1a6e55d06cebf8fb) Update generate.sh - [`c715a1e`](https://github.com/go-gitea/git/commit/c715a1e417706e683f18a6852463ca89f8e69e41) Update repo_merge_test.go - [`014c3fb`](https://github.com/go-gitea/git/commit/014c3fb098e12f0110d12ce90d3ed90ef61f86fd) Add generated testdata ### 📊 Changes **5 files changed** (+331 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `Makefile` (+1 -0) 📝 `command.go` (+10 -2) ➕ `repo_merge.go` (+116 -0) ➕ `repo_merge_test.go` (+94 -0) ➕ `testdata/generate.sh` (+110 -0) </details> ### 📄 Description Support branch mering for bare repository TODO: 1. More reliable result validation (or better testing strategy). 2. Test merging with conflict. 3. Test merging with added files. 4. Support different options (e.g. --squash --no-ff --ff-only) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
yindo added the pull-request label 2026-02-16 10:24:05 -05:00
yindo closed this issue 2026-02-16 10:24:05 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
kind/bug
kind/enhancement
kind/question
kind/testing
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
yindo
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: go-gitea/git#91
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?