Error when viewing a file that was created in a merge

XMLWordPrintable

      Suppose you have two branches of a repository. On one, there is a path a/b/c.txt, and on the other, this file doesn't exist.

      In a commit that merges these branches together, the file is moved to d/e/f.txt. Thus when viewing the merge diff, the file is Moved on one branch, and Created on the other.

      When attempting to view this file at /projects/PROJ/repos/REPO/browse/d/e/f.txt, a 500 error will be thrown while attempting to populate the commit "badge" in the upper right of the UI because no commit ever actually modified this file.

      The following is logged in atlassian-bitbucket.log:

      2016-05-31 15:32:19,930 WARN  [http-nio-7990-exec-7] smaruvada @3H8VA8x932x688x0 10mi4n 192.168.10.1 "GET /projects/META/repos/puppets/browse/crash2 HTTP/1.1" c.a.s.i.w.s.f.AvatarUrlFunction Error getting avatar URL for null
java.lang.NullPointerException: person
	at com.google.common.base.Preconditions.checkNotNull(Preconditions.java:226) ~[guava-18.0.jar:na]
	at com.atlassian.stash.internal.avatar.ConfigurableAvatarService.getUrlForPerson(ConfigurableAvatarService.java:199) ~[bitbucket-service-impl-4.6.1.jar:na]
	at com.atlassian.plugin.util.ContextClassLoaderSettingInvocationHandler.invoke(ContextClassLoaderSettingInvocationHandler.java:26) ~[atlassian-plugins-core-4.1.8.jar:na]
	at com.atlassian.stash.internal.web.soy.functions.AvatarUrlFunction.getUrl(AvatarUrlFunction.java:80) [classes/:na]
	at com.atlassian.stash.internal.web.soy.functions.AvatarUrlFunction.apply(AvatarUrlFunction.java:67) [classes/:na]
	at com.atlassian.stash.internal.web.soy.functions.AvatarUrlFunction.apply(AvatarUrlFunction.java:23) [classes/:na]
	at com.atlassian.soy.impl.modules.SoyJavaFunctionAdapter.computeForJava(SoyJavaFunctionAdapter.java:34) [soy-template-plugin-4.3.0.jar:na]

            Assignee:
            Max Barrett (Inactive)
            Reporter:
            Adam Ahmed (Inactive)
            Votes:
            3 Vote for this issue
            Watchers:
            7 Start watching this issue

              Created:
              Updated:
              Resolved: