diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-09-17 21:57:44 +1000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-18 13:56:58 -0700 |
| commit | 894642f68d3160db9116ca350da83c4a78cff8f2 (patch) | |
| tree | bb5b925867f3faca25b218fd6505108e488c88c7 /t/t2001-checkout-cache-clash.sh | |
| parent | merge: use return value of resolve_ref() to determine if HEAD is invalid (diff) | |
| download | tgif-894642f68d3160db9116ca350da83c4a78cff8f2.tar.xz | |
merge: remove global variable head[]
Also kill head_invalid in favor of "head_commit == NULL".
Local variable "head" in cmd_merge() is renamed to "head_sha1" to make
sure I don't miss any access because this variable should not be used
after head_commit is set (use head_commit->object.sha1 instead).
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/t2001-checkout-cache-clash.sh')
0 files changed, 0 insertions, 0 deletions