diff options
author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-10-18 14:07:11 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-18 14:36:17 -0700 |
commit | 0fe700e311f2d7e55eb23fe941fab9155d7f91df (patch) | |
tree | 0ab1992cb3fc0eeb2f0ccbf09c073fb2da0e9c02 /t/t4013/diff.diff_--no-index_--name-status_dir2_dir | |
parent | branch: delete symref branch, not its target (diff) | |
download | tgif-0fe700e311f2d7e55eb23fe941fab9155d7f91df.tar.xz |
branch: skip commit checks when deleting symref branches
Before a branch is deleted, we check that it points to a valid
commit. With -d we also check that the commit is a merged; this
check is not done with -D.
The reason for that is that commits pointed to by branches should
never go missing; if they do then something broke and it's better
to stop instead of adding to the mess. And a non-merged commit
may contain changes that are worth preserving, so we require the
stronger option -D instead of -d to get rid of them.
If a branch consists of a symref, these concerns don't apply.
Deleting such a branch can't make a commit become unreferenced,
so we don't need to check if it is merged, or even if it is
actually a valid commit. Skip them in that case. This allows
us to delete dangling symref branches.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_--no-index_--name-status_dir2_dir')
0 files changed, 0 insertions, 0 deletions