Questions tagged with AWS CodeCommit

Content language: English

Sort by most recent

Browse through the questions and answers listed below or filter and sort to narrow down your results.

Pull requests wrongly marked as "Merged"?

We like to create pull requests early for new branches, meaning the developer who makes the branch will immediately create one or more pull requests to signal the intended destination branch(es) (for example both "dev" and "main" for hot-fixes). While the task is in progress, the related, pending pull request(s) are marked with status "Open" But sometimes a pull request changes status to "Merged" even before the developer has had time to push any changes. However, when we click on the "Changes" tab, we see that nothing has actually been merged, and instead there is a message saying: > Differences between the source branch and the destination branch cannot be displayed for this pull request. The branch specified as the destination branch includes all the changes in the branch specified as the source branch as well as additional changes. You might have mixed up which branch should be the source, and which branch should be the destination. We suspect this happens when another pull request is being merged, and that this triggers some kind of global check of all pull requests in the repo, to see if there is a diff, and if a pull request has no diff, AWS CodeCommit "helps" us clean up our "obsolete" PRs. However, to us this is just counter-productive and confusing: Pull requests that nobody has merged are marked as merged, when the exact opposite is true. Had there been at least another status, like "Nothing to merge", then it would have been less mysterious, but still very counter-productive: Whenever this happens, we need to click on the "Changes" tab to make sure that this is actually a "Nothing to merge" status, and create a NEW pull request for anything that has been pushed to the branch after this unwanted "clean up". Question: Is there a way to avoid early pull requests from being updated automatically like this, so that it will be entirely up to the developers to decide when a pull request should be marked as merged (i.e. have it marked as merged when it is actually merged, and only then)? Thanks, and best regards, wab
0
answers
0
votes
22
views
wab
asked 6 months ago

CodeCommit Git Windows fatal: Failed to write item to store [0x6c6]

Is there a solution for the *fatal* message *0x6c6* that shows up in git-bash for Windows? It's annoying since it appears that operations continue normally other than the "fatal" part. My coworkers using Windows experience the same problem. I've included the full error along with the *GIT_TRACE=1* info. 09:45:39.933420 run-command.c:654 trace: run_command: 'git credential-manager-core store' 09:45:40.042896 exec-cmd.c:237 trace: resolved executable dir: C:/Users/xxxxxxxx/AppData/Local/Programs/Git/mingw64/libexec/git-core 09:45:40.042896 git.c:748 trace: exec: git-credential-manager-core store 09:45:40.042896 run-command.c:654 trace: run_command: git-credential-manager-core store fatal: Failed to write item to store. [0x6c6] fatal: The array bounds are invalid This is a newly setup Win10 Pro system. I'm using the following: git 2.36.1, Python 3.10.4, git-remote-codecommit 1.16, and we use a non AWS identity provider for SSO. $ aws --version aws-cli/2.6.3 Python/3.9.11 Windows/10 exe/AMD64 prompt/off Here's ~/.gitconfig on the affected system. [credential "url pointing to aws codecommit"] provider = generic [protocol "codecommit"] allow = always Here's part of the repo .git/config [core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true [submodule] active = . [remote "origin"] url = codecommit::region://repo-name fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master Linux systems don't have this problem.
2
answers
0
votes
1430
views
hubbs
asked 7 months ago