| commit | 29575904c8d4dd40c30d6171fa54e769a1337446 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 May 2012 22:05:36 +0000 (7 15:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 May 2012 22:05:36 +0000 (7 15:05 -0700) | ||
| tree | 925355483ef581ca531f14c329307b1c8fc5e981 | treesnapshot (tar.gz zip) |
| parent | af4e16f22a66d84d0fc1ffb295dc6dd300162d49 | commitdiff |
| parent | 5d8863954f077d2c262d5cc4fc669947ff23d6d5 | commitdiff |
Merge branch 'js/checkout-detach-count' into next
When checking out another commit from an already detached state, we used
to report all commits that are not reachable from any of the refs as
lossage, but some of them might be reachable from the new HEAD, and there
is no need to warn about them.
By Johannes Sixt
* js/checkout-detach-count:
checkout (detached): truncate list of orphaned commits at the new HEAD
t2020-checkout-detach: check for the number of orphaned commits
When checking out another commit from an already detached state, we used
to report all commits that are not reachable from any of the refs as
lossage, but some of them might be reachable from the new HEAD, and there
is no need to warn about them.
By Johannes Sixt
* js/checkout-detach-count:
checkout (detached): truncate list of orphaned commits at the new HEAD
t2020-checkout-detach: check for the number of orphaned commits
| builtin/checkout.c | diff1 | diff2 | blobhistory |
| t/t2020-checkout-detach.sh | diff1 | diff2 | blobhistory |