Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-3400

MergeConflictHandler must use `git add -f` to ignore .gitignore

    XMLWordPrintable

Details

    Description

      If some branch contains changes described in .gitignore then Automerge commit can't be completed. Stash should be use `git add -f` instead of simple "soft" `git add`.

      [INFO] [talledLocalContainer] Use -f if you really want to add them.
[INFO] [talledLocalContainer] fatal: no files added
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.GitCommandExitHandler.evaluateThrowable(GitCommandExitHandler.java:116) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.GitCommandExitHandler.onError(GitCommandExitHandler.java:159) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.DefaultCommandExitHandler.onExit(DefaultCommandExitHandler.java:35) ~[stash-spi-2.3.1.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.BaseCommand.callExitHandler(BaseCommand.java:142) ~[stash-spi-2.3.1.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.BaseCommand$CommandFuture.internalGet(BaseCommand.java:262) ~[stash-spi-2.3.1.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.BaseCommand$CommandFuture.get(BaseCommand.java:229) ~[stash-spi-2.3.1.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.BaseCommand.call(BaseCommand.java:79) ~[stash-spi-2.3.1.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.MergeConflictHandler.flushIf(MergeConflictHandler.java:362) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.MergeConflictHandler.add(MergeConflictHandler.java:350) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.MergeConflictHandler.visit(MergeConflictHandler.java:146) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.scm.git.merge.ContentGitMergeConflict.accept(ContentGitMergeConflict.java:19) ~[stash-scm-git-api-2.3.1_1364957480000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.ConflictHandlingPullRequestMergeHandler.handleConflicts(ConflictHandlingPullRequestMergeHandler.java:203) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.ConflictHandlingPullRequestMergeHandler.commitConflicts(ConflictHandlingPullRequestMergeHandler.java:179) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.ConflictHandlingPullRequestMergeHandler.mergeIn(ConflictHandlingPullRequestMergeHandler.java:126) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	at com.atlassian.stash.internal.scm.git.merge.MergeCommand.call(MergeCommand.java:111) ~[stash-scm-git-2.3.1_1364957494000.jar:na]
[INFO] [talledLocalContainer] 	... 281 common frames omitted
[INFO] [talledLocalContainer] Caused by: com.atlassian.utils.process.ProcessException: Non-zero exit code: 128

      Attachments

        Issue Links

          mentioned in

          Page Loading...

          Activity

            People

              bturner Bryan Turner (Inactive)
              3652ed9ede2e Alexey Efimov
              Votes:
              0 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: