projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 10b98fa) | patch
merge: remove global variable head[]
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sat, 17 Sep 2011 11:57:44 +0000 (21:57 +1000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Sep 2011 20:56:58 +0000 (13:56 -0700)
commit894642f68d3160db9116ca350da83c4a78cff8f2
treebb5b925867f3faca25b218fd6505108e488c88c7tree | snapshot
parent10b98fa5b3fab4a4ba46f31b58f8da703b465b68commit | diff
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>
builtin/merge.c diff | blob | history
Git—the stupid content tracker