Skip to contentSkip to conversation

Strange behaviour of git log --follow

DISCUSSION Victor 2 participants 4 messages Mar 28, 2019

lore
Share & tools
lore

Victor

author
#0 lore raw

Hello.

$ git log include/__vic/mutex.h
commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a
Merge: 96dd9a2 f484f4e
Author: __vic <[email protected]>
Date: 2017-12-13 10:41:32 +0300

Merge branch 'generic' into posix

commit f484f4e8aae32041ba56bdce12d1efd8491e94d5
Merge: 86b848a b9bbbe6
Author: __vic <[email protected]>
Date: 2017-12-12 17:35:10 +0300

waitable_event, thread, mutex

$ git log --follow include/__vic/mutex.h
$

Why --follow makes git produce truncated history for file that wasn't renamed?

My repository is available here https://github.com/2underscores-vic/__vic

#1 lore raw
Quoted 16 lines · Victor

Hello.

$ git log include/__vic/mutex.h
commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a
Merge: 96dd9a2 f484f4e
Author: __vic <[email protected]>
Date: 2017-12-13 10:41:32 +0300

Merge branch 'generic' into posix

commit f484f4e8aae32041ba56bdce12d1efd8491e94d5
Merge: 86b848a b9bbbe6
Author: __vic <[email protected]>
Date: 2017-12-12 17:35:10 +0300

waitable_event, thread, mutex

Quoted 8 lines
$ git log --follow include/__vic/mutex.h
$

Why --follow makes git produce truncated history for file that wasn't renamed?

My repository is available here
https://github.com/2underscores-vic/__vic

I just briefly looked at this. It's because all changes to the relevant file are in merge commits. If you run the "log" with "--stat" you'll see no output.

Something in the --follow machinery takes the same shortcut on merges and doesn't consider them.

author
#2 lore raw

Any plans to fix this?

Quoted 34 lines · On Thu, 28 Mar 2019 14:16:43 +0100 Ævar Arnfjörð Bjarmason <[email protected]>…
Quoted 16 lines · Victor

Hello.

$ git log include/__vic/mutex.h
commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a
Merge: 96dd9a2 f484f4e
Author: __vic <[email protected]>
Date: 2017-12-13 10:41:32 +0300

Merge branch 'generic' into posix

commit f484f4e8aae32041ba56bdce12d1efd8491e94d5
Merge: 86b848a b9bbbe6
Author: __vic <[email protected]>
Date: 2017-12-12 17:35:10 +0300

waitable_event, thread, mutex

Quoted 8 lines
$ git log --follow include/__vic/mutex.h
$

Why --follow makes git produce truncated history for file that wasn't renamed?

My repository is available here
https://github.com/2underscores-vic/__vic

I just briefly looked at this. It's because all changes to the relevant file are in merge commits. If you run the "log" with "--stat" you'll see no output.

Something in the --follow machinery takes the same shortcut on merges and doesn't consider them.

#3 lore raw
Quoted 1 line · Victor

Any plans to fix this?

No. I just thought I'd peek at it for a sec, sorry. Maybe someone else is interested it poking it some more.

Quoted 40 lines
Quoted 38 lines · On Thu, 28 Mar 2019 14:16:43 +0100 Ævar Arnfjörð Bjarmason <[email protected]>…
Quoted 19 lines · Victor

Hello.

$ git log include/__vic/mutex.h
commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a
Merge: 96dd9a2 f484f4e
Author: __vic <[email protected]>
Date: 2017-12-13 10:41:32 +0300

Merge branch 'generic' into posix

commit f484f4e8aae32041ba56bdce12d1efd8491e94d5
Merge: 86b848a b9bbbe6
Author: __vic <[email protected]>
Date: 2017-12-12 17:35:10 +0300

waitable_event, thread, mutex

$ git log --follow include/__vic/mutex.h
$
Quoted 6 lines

Why --follow makes git produce truncated history for file that wasn't
renamed?

My repository is available here
https://github.com/2underscores-vic/__vic

I just briefly looked at this. It's because all changes to the relevant
file are in merge commits. If you run the "log" with "--stat" you'll see
no output.

Something in the --follow machinery takes the same shortcut on merges
and doesn't consider them.