summaryrefslogtreecommitdiff
path: root/t/t7500/edit-content
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-09-17 21:57:43 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-18 13:55:56 -0700
commit10b98fa5b3fab4a4ba46f31b58f8da703b465b68 (patch)
treec0e1b8e9d884faa2a43b05ece0f688b9bc66532f /t/t7500/edit-content
parentmerge: keep stash[] a local variable (diff)
downloadtgif-10b98fa5b3fab4a4ba46f31b58f8da703b465b68.tar.xz
merge: use return value of resolve_ref() to determine if HEAD is invalid
resolve_ref() only updates "head" when it returns non NULL value (it may update "head" even when returning NULL, but not in all cases). Because "head" is not initialized before the call, is_null_sha1() is not enough. Check also resolve_ref() return value. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7500/edit-content')
0 files changed, 0 insertions, 0 deletions