diff options
| author |  Pierre Habouzit <madcoder@debian.org> | 2010-07-07 09:47:20 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-07 09:17:00 -0700 |
| commit | 765c22588d9e410bf0100c4991b1945134da6959 (patch) | |
| tree | 3f86977024c13d2b94269974b9d077231586f38e /t/t3030-merge-recursive.sh | |
| parent | add missing && to submodule-merge testcase (diff) | |
| download | tgif-765c22588d9e410bf0100c4991b1945134da6959.tar.xz | |
fix git branch -m in presence of cross devices
When you have for example a bare repository stored on NFS, and that you
create new workdirs locally (using contrib's git-new-workdir), logs/refs
is a symlink to a different device. Hence when the reflogs are renamed,
all must happen below logs/refs or one gets cross device rename errors
like:
git branch -m foo
error: unable to move logfile logs/refs/heads/master to tmp-renamed-log: Invalid cross-device link
fatal: Branch rename failed
The fix is hence to use logs/refs/.tmp-renamed-log as a temporary log
name, instead of just tmp-renamed-log.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions