summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-06-22 14:03:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-22 20:17:12 (GMT)
commite426ff4222ba82a57ed459320509273dc8959ade (patch)
tree6beec8b70933e9068471a1c284b883e834acd885 /builtin/log.c
parentfb802b312961f49d0aa35f50e72a9a2d17fde9aa (diff)
downloadgit-e426ff4222ba82a57ed459320509273dc8959ade.zip
git-e426ff4222ba82a57ed459320509273dc8959ade.tar.gz
git-e426ff4222ba82a57ed459320509273dc8959ade.tar.bz2
initial_ref_transaction_commit(): check for ref D/F conflicts
In initial_ref_transaction_commit(), check for D/F conflicts (i.e., the type of conflict that exists between "refs/foo" and "refs/foo/bar") among the references being created and between the references being created and any hypothetical existing references. Ideally, there shouldn't *be* any existing references when this function is called. But, at least in the case of the "testgit" remote helper, "clone" can be called after the remote-tracking "HEAD" and "master" branches have already been created. So let's just do the full-blown check. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
0 files changed, 0 insertions, 0 deletions