diff options
| author |  Brian Bourn <ba.bourn@gmail.com> | 2014-03-19 11:58:21 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-19 11:49:35 -0700 |
| commit | 9daf0ef065bfef4fb9dcc1710a39a8177695c84f (patch) | |
| tree | fa0d1d13391c08fc0c482a3f6e4a4e05b0a8b62a /Documentation/git-merge-base.txt | |
| parent | Git 1.9.0 (diff) | |
| download | tgif-9daf0ef065bfef4fb9dcc1710a39a8177695c84f.tar.xz | |
diff-no-index: rename read_directory()
In the next patch, we will replace a manual checking of "." or ".."
with a call to is_dot_or_dotdot() defined in dir.h. The private
function read_directory() defined in this file will conflict with
the global function declared there when we do so.
As a preparatory step, rename the private read_directory() to avoid
the name collision.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Brian Bourn <ba.bourn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions