Skip to contentSkip to conversation

finding unmerged branches

DISCUSSION Joey Hess 4 participants 7 messages Jun 15, 2016

lore
Share & tools
lore

Joey Hess

author
#0 lore raw

My situation is this: My project has a lot of remotes with lots of branches; about 250 branches in total. I want to figure out which of these branches to look at to consider merging.

So, I reach for git branch -a --no-merged master; that's what its man page says its for. But this still finds 120 branches, and a lot of them are not things I want to look at. Many of them are copies of some of my own branches.

What I really want is a way to find remote branches that are not merged with any of my local branches (or any origin branches). A slow and stupid implementation of that is in the attached git-unmerged script, and it weeds the branch list down to 68 branches, which are mostly really ones I might want to look at.

So, three questions:

* Is this situation somewhat common, or an I doing something wrong? (Assuming that I have a good reason to want to look at remote branches rather than waiting to get merge requests.)
* Is there a better way to accomplish this than a slow perl script that runs git branch -r --merged foreach of my branches?
* Should git have something builtin to handle this case better?

Signature · 1 line
see shy jo

#!/usr/bin/perl

my @remote_branches = split ' ', git branch -r | awk '{print $1}';

# have to filter out the "* "
my @local_branches = split ' ', `git branch | sed 's/^..//'`;

my @origin_branches = grep /^origin\//, @remote_branches;

my %unmerged = (map { $_ => 1 } @remote_branches),

	(map { $_ => 0 } @local_branches, @origin_branches);
foreach my $branch (@local_branches, @origin_branches) {
	map { $unmerged{$_}=0 } split ' ', `git branch -r --merged "$branch" | awk '{print $1}'`
}
foreach my $branch (sort keys %unmerged) {
	print "$branch\n" if $unmerged{$branch};
}
#1 lore raw
Quoted 17 lines · Joey Hess

My situation is this: My project has a lot of remotes with lots of branches; about 250 branches in total. I want to figure out which of these branches to look at to consider merging.

So, I reach for git branch -a --no-merged master; that's what its man page says its for. But this still finds 120 branches, and a lot of them are not things I want to look at. Many of them are copies of some of my own branches.

What I really want is a way to find remote branches that are not merged with any of my local branches (or any origin branches). A slow and stupid implementation of that is in the attached git-unmerged script, and it weeds the branch list down to 68 branches, which are mostly really ones I might want to look at.

Quoted 7 lines

So, three questions:

* Is this situation somewhat common, or an I doing something wrong? (Assuming that I have a good reason to want to look at remote branches rather than waiting to get merge requests.)
* Is there a better way to accomplish this than a slow perl script that runs git branch -r --merged foreach of my branches?

Hm, not sure if I'd call it "better", but probably at least a bit faster. You could create a "fake" merge to combine all the branches.

git branch -r --no-merged $(
: | git commit-tree HEAD^{tree} $(

    git for-each-ref --format='-p %(refname)' \
      refs/heads/ \
      refs/remotes/origin
    )

)

Björn

author
#2 lore raw
Quoted 10 lines · Björn Steinbrink

Hm, not sure if I'd call it "better", but probably at least a bit faster. You could create a "fake" merge to combine all the branches.

git branch -r --no-merged $(
: | git commit-tree HEAD^{tree} $(

    git for-each-ref --format='-p %(refname)' \
      refs/heads/ \
      refs/remotes/origin
    )

)

That does run fast. Has some warnings about duplicate parents. The gitk method seems more useful.

Signature · 1 line
see shy jo
#3 lore raw
In reply to Björn Steinbrink
Quoted 10 lines · Björn Steinbrink

Hm, not sure if I'd call it "better", but probably at least a bit faster. You could create a "fake" merge to combine all the branches.

git branch -r --no-merged $(
: | git commit-tree HEAD^{tree} $(

    git for-each-ref --format='-p %(refname)' \
      refs/heads/ \
      refs/remotes/origin
    )

)

Heh, that is certainly a cute hack ;-)

author
#4 lore raw
In reply to Joey Hess
Quoted 3 lines · Joey Hess

* Is this situation somewhat common, or an I doing something wrong? (Assuming that I have a good reason to want to look at remote branches rather than waiting to get merge requests.)

Come to think, the github fork queue serves basically the same purpose, but only for branches in github.

Signature · 1 line
see shy jo
#5 lore raw
In reply to Joey Hess
Quoted 6 lines · Joey Hess

What I really want is a way to find remote branches that are not merged with any of my local branches (or any origin branches). A slow and stupid implementation of that is in the attached git-unmerged script, and it weeds the branch list down to 68 branches, which are mostly really ones I might want to look at.

How about:

gitk $(git for-each-ref --format='%(refname)' 'refs/remotes/'; git for-each-ref --format='^%(refname)' 'refs/heads/')

You could also replace 'gitk' with 'git log', and mess with the --pretty=format:whatever parameter.

Have fun,

Avery

author
#6 lore raw
Quoted 7 lines · Avery Pennarun

How about:

gitk $(git for-each-ref --format='%(refname)' 'refs/remotes/'; git for-each-ref --format='^%(refname)' 'refs/heads/')

You could also replace 'gitk' with 'git log', and mess with the --pretty=format:whatever parameter.

I added 'refs/remotes/origin/' 'refs/tags/' to the list, and that's almost perfect, thanks.

Though there was one remote branch where gitk showed a lot of commits from origin/master before the unmerged changes in the branch. Could not figure out why, git log doesn't show them.

Signature · 1 line
see shy jo