From: Eric Sunshine Date: Sun, 25 Oct 2015 00:18:19 GMT Subject: Re: [PATCH] ref-filter: fallback on alphabetical comparison Message-ID: In-Reply-To: <1445697770-29331-1-git-send-email-Karthik.188@gmail.com> On Sat, Oct 24, 2015 at 10:42 AM, Karthik Nayak wrote: > In ref-filter.c the comparison of refs while sorting is handled by > cmp_ref_sorting() function. When sorting as per numerical values > (e.g. --sort=objectsize) there is no fallback comparison when both refs > hold the same value. This can cause unexpected results as pointed out > by Johannes Sixt ($gmane/280117). Please make the commit message self-contained by describing the "unexpected results" here rather than directing readers to chase down the information elsewhere themselves. > Hence, fallback to alphabetical comparison based on the refname whenever > the other criterion is equal. Fix the test in t3203 in this regard. > > Signed-off-by: Karthik Nayak It would not be amiss to add a Reported-by: to credit j6t. > --- > diff --git a/ref-filter.c b/ref-filter.c > index 046e73b..7b33cb8 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -1698,7 +1698,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru > if (va->ul < vb->ul) > cmp = -1; > else if (va->ul == vb->ul) > - cmp = 0; > + cmp = strcmp(a->refname, b->refname); > else > cmp = 1; > } > diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh > index f77971c..9f2d482 100755 > --- a/t/t3203-branch-output.sh > +++ b/t/t3203-branch-output.sh > @@ -158,8 +158,8 @@ EOF > > test_expect_success 'git branch `--sort` option' ' > cat >expect <<-\EOF && > - branch-two > * (HEAD detached from fromtag) > + branch-two > branch-one > master > EOF > -- > 2.6.2