| commit | a0bfaf0796e416bb1cecd03e30af3e189a039a29 | |
| author | Christian Couder <christian.couder@gmail.com> | |
| Tue, 24 May 2016 08:11:03 +0000 (24 10:11 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Jun 2016 17:10:16 +0000 (1 10:10 -0700) | ||
| tree | 8cf5b6c0aa9f7b43105a4b47e824f155ef794c80 | treesnapshot (tar.gz zip) |
| parent | f4c9eaa49c5ed87b304a40b95b1d06d46a8cbfa9 | commitdiff |
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
To libify the apply functionality the 'fake_ancestor' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.
By the way remove a comment about '--index-info' that was renamed
'--build-fake-ancestor' in commit 26b28007689d27a921ea90e5a29fc8eb74b0d297
(apply: get rid of --index-info in favor of --build-fake-ancestor,
Sep 17 2007).
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
To libify the apply functionality the 'fake_ancestor' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.
By the way remove a comment about '--index-info' that was renamed
'--build-fake-ancestor' in commit 26b28007689d27a921ea90e5a29fc8eb74b0d297
(apply: get rid of --index-info in favor of --build-fake-ancestor,
Sep 17 2007).
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/apply.c | diffblobblamehistory |