ref-filter: fallback on alphabetical comparison
PATCH v2 1/1 ref-filter: fallback on alphabetical comparison
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 (i.e. the order of listting refs with equal values cannot be pre-determined) as pointed out by Johannes Sixt ($gmane/280117).
Hence, fallback to alphabetical comparison based on the refname whenever the other criterion is equal. Fix the test in t3203 in this regard.
--- ref-filter.c | 2 +- t/t3203-branch-output.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
ref-filter.c +1 -1
@@ -1698,7 +1698,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struif (va->ul < vb->ul) cmp =-1 ;else if (va->ul == vb->ul) - cmp =0 ; + cmp =strcmp (a->refname, b->refname);else cmp =1 ; }
t/t3203-branch-output.sh +1 -1
@@ -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
Signature · 1 line
2.6.2
Quoted 5 lines · Karthik Nayak
In
ref-filter.cthe comparison of refs while sorting is handled bycmp_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 (i.e. the order of listting refs with equal values cannot be pre-determined) as
s/listting/listing/
Quoted 42 lines
pointed out by Johannes Sixt ($gmane/280117).
Hence, fallback to alphabetical comparison based on the refname whenever the other criterion is equal. Fix the test in t3203 in this regard.
Reported-by Johannes Sixt <[email protected]>Signed-off-by Karthik Nayak <[email protected]>--- ref-filter.c | 2 +- t/t3203-branch-output.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)ref-filter.c +1
-1@@ -1698,7 +1698,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struif (va->ul < vb->ul) cmp =-1 ;else if (va->ul == vb->ul) - cmp =0 ; + cmp =strcmp (a->refname, b->refname);else cmp =1 ; }t/t3203-branch-output.sh +1
-2@@ -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
Quoted 8 lines · Eric Sunshine
Quoted 5 lines · Karthik Nayak
In
ref-filter.cthe comparison of refs while sorting is handled bycmp_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 (i.e. the order of listting refs with equal values cannot be pre-determined) ass/listting/listing/
Thanks for pointing out. Should I re-roll?
Signature · 2 lines
Regards, Karthik Nayak