Skip to content

Replacing checks for '/' in branch names by checks for "origin/"#105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
johanneslerch wants to merge 1 commit into from
Closed

Replacing checks for '/' in branch names by checks for "origin/" #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/historyview.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -860,7 +860,7 @@ define(['d3'], function() {

for (b = 0; b < this.branches.length; b++) {
branch = this.branches[b];
if (branch.indexOf('/') === -1) {
if (!branch.startsWith("origin/")) {
commit = this.getCommit(branch);
parent = this.getCommit(commit.parent);
parent2 = this.getCommit(commit.parent2);
Expand DownExpand Up@@ -916,7 +916,7 @@ define(['d3'], function() {
var classes = 'branch-tag';
if (d.name.indexOf('[') === 0 && d.name.indexOf(']') === d.name.length - 1) {
classes += ' git-tag';
} else if (d.name.indexOf('/') >= 0) {
} else if (d.name.startsWith("origin/")) {
classes += ' remote-branch';
} else if (d.name.toUpperCase() === 'HEAD') {
classes += ' head-tag';
Expand DownExpand Up@@ -963,7 +963,7 @@ define(['d3'], function() {
var display = this.svg.select('text.current-branch-display'),
text = 'HEAD: ';

if (branch && branch.indexOf('/') === -1) {
if (branch && !branch.startsWith("origin/")) {
text += branch;
this.currentBranch = branch;
} else {
Expand Down