Bug#683568: git: NO_HARDLINKS broke in 1.7.11 (renamed to NO_INSTALL_HARDLINKS)

# doesn't affect versions <= sid
tags 683568 + experimental
quit

Hi,

Anders Kaseorg wrote:

Version: 1:1.7.11-1~exp0

This version was never uploaded to the Debian archive, so I hope we
can get away with any temporary migration code tweaks being
PPA-specific (because I really want to get rid of that code in
wheezy+1). If not, we can find a way, though.

[...]

NO_HARDLINKS was renamed to
NO_INSTALL_HARDLINKS. debian/rules needs to be updated accordingly, and
the migration code in git.preinst might need to be adjusted.

Thanks for catching it. Presumably the following works. Does the
sanity check to prevent it happening again make sense?

Hope that helps,
Jonathan

diff --git a/debian/rules b/debian/rules
index 4894bf8..41fcc50 100755
a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \
NO_PYTHON=1 \
USE_SRV_RR=1 \
THREADED_DELTA_SEARCH=1 \
- NO_CROSS_DIRECTORY_HARDLINKS=1 NO_HARDLINKS=1 \
+ NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 \
DEFAULT_PAGER=pager DEFAULT_EDITOR=editor \
CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)'
DOC_OPTS =prefix=/usr htmldir=/usr/share/doc/git/html \
@@ -105,6 +105,9 @@ install-arch: deb-checkdir deb-checkuid build-arch-stamp
install -d -m0755 '$(GIT)'/etc/bash_completion.d
install -m0644 contrib/completion/git-completion.bash \
'$(GIT)'/etc/bash_completion.d/git
+ # sanity check that #642603 fix is still in place
+ test $(stat -c%h \
+ '$(GIT)'/usr/lib/git-core/git-branch) -le 10
# gitweb
install -d -m0755 '$(GIT)'/usr/share/gitweb
ln -s gitweb.cgi '$(GIT)'/usr/share/gitweb/index.cgi


To UNSUBSCRIBE, email to
with a subject of "unsubscribe". Trouble? Contact