diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-05 15:54:52 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-05 15:54:52 -0400 |
| commit | 9aa10480680cfe57e9d53bf488ba1b7d8e199a2a (patch) | |
| tree | b4c285c579cf746585477952a0e2e1e326a4f2e8 /debian | |
| parent | c1e01a5ccce06745d1344b3013b91331058f4b52 (diff) | |
Check git version at runtime, rather than assuming it will be the same as the git version used at build time when running git-checkattr and git-branch remove.
It's ok to probe every time for git-branch remove because that's
run quite rarely. For git-checkattr, it's run only once, when
starting the --batch mode, and so again the overhead is pretty minimal.
This leaves 2 places where the build version is still used.
git merge might be interactive or fail if one skews, and --no-gpg-sign
might not be pased, or might be passed to a git that doesn't understand it
if the other skews. It seems a little expensive to check the git version
each time these are used.
This doesn't seem likely to cause many problems, at least compared with
check-attr hanging on skew.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1efbdd9da..908636f05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ git-annex (5.20141232) UNRELEASED; urgency=medium * Android: Provide a version built with -fPIE -pie to support Android 5.0. * sync: Fix an edge case where syncing in a bare repository would try to merge and so fail. + * Check git version at runtime, rather than assuming it will be the same + as the git version used at build time when running git-checkattr and + git-branch remove. -- Joey Hess <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400 |