yves-biener/gitwarrior
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

add(taskwarrior): merge for remote changes without local changes

Browse Source
This commit is contained in:
Yves Biener
2023-10-22 16:32:15 +02:00
parent 5764a32f02
commit 469cf102ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/gitw/project.go
View File

@@ -52,7 +52,7 @@ func (project *Project) Fetch() error {
issue_comments = append(issue_comments, gitea.Comment{ issue_comments = append(issue_comments, gitea.Comment{
Body: strings.ReplaceAll(issue.Body, "\r\n", "\n"), Body: strings.ReplaceAll(issue.Body, "\r\n", "\n"),
Created_at: issue.Created_at, Created_at: issue.Created_at,
Updated_at: issue.Updated_at, Updated_at: issue.Created_at,
}) })
for _, comment := range comments { for _, comment := range comments {
if comment.Issue_url == issue.Html_url { if comment.Issue_url == issue.Html_url {
@@ -210,7 +210,7 @@ func (issue *Issue) MergeTask(task taskwarrior.Task) (taskwarrior.Task, error) {
task.Status = prompt(task.Status, issue.git_issue.State, task.Status) task.Status = prompt(task.Status, issue.git_issue.State, task.Status)
} }
} }
if len(task.Annotations) != len(issue.comments)+1 { if len(task.Annotations) != len(issue.comments) {
var annotations []string var annotations []string
annotations = append(annotations, issue.git_issue.Body) annotations = append(annotations, issue.git_issue.Body)
for _, annotation := range task.Annotations { for _, annotation := range task.Annotations {