[git-users] Question about {diff,merge}.renameLimit

2020-03-13 Thread Tassilo Horn
Hi all, I frequently merge between branches, thus I use above-standard values for diff.renameLimit and merge.renameLimit. Recently, there was a large restructuring on the master branch where almost all files where moved. So when merging fixes from the last release branch into master, git would

[git-users] What's the first released version containing the fix for ABCD-12919?

2020-03-13 Thread Tassilo Horn
Hi all, I'm frequently asked the question in the subject. ABCD-12919 is some ticked number (yes, we use JIRA, thanks for your compassion), and technically the question boils down to: What's the first (oldest) tag on branch B from which the last commit (assuming the possibility that a fix

Re: [git-users] What's the first released version containing the fix for ABCD-12919?

2020-03-13 Thread Konstantin Khomoutov
On Fri, Mar 13, 2020 at 07:39:49AM +0100, Tassilo Horn wrote: > I'm frequently asked the question in the subject. ABCD-12919 is some > ticked number (yes, we use JIRA, thanks for your compassion), and > technically the question boils down to: > > What's the first (oldest) tag on branch B from

Re: [git-users] Question about {diff,merge}.renameLimit

2020-03-13 Thread Philip Oakley
Hi Tassilo, I don't believe that config variable works correctly. There is currently some work being done by Elijah Newren on trying to refactor and consolidate all the different bits of merge and rename detection code, and that (IIRC) was one of the issues (and there are many). Have a search

Re: [git-users] Question about {diff,merge}.renameLimit

2020-03-13 Thread Tassilo Horn
Philip Oakley writes: Hi Philip, > I don't believe that config variable works correctly. Aside from the performance aspects, I have the subjective feeling that git detects renames better with higher values which is the main motivation for me. But honestly I didn't really compare like trying

Re: [git-users] What's the first released version containing the fix for ABCD-12919?

2020-03-13 Thread Tassilo Horn
Konstantin Khomoutov writes: Hi Konstantin, > The closest thing I can think of is to have a shell script reading > along these lines: > > 8< > #!/bin/sh > > set -e -u > > if [ $# -ne 1 ]; then > printf 'Usage: %s