diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-01-06 14:45:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-06 09:34:21 -0800 |
| commit | 0be0521b23f46dac586e1b464fafe8b97027b645 (patch) | |
| tree | cc77526800270ba7e2d569ad94f2d31e16ca87c0 /merge-recursive.c | |
| parent | 9e6f885d146c58b23b166a99b93f115735b7bf22 (diff) | |
| download | git-0be0521b23f46dac586e1b464fafe8b97027b645.tar.gz | |
safe_create_leading_directories(): introduce enum for return values
Instead of returning magic integer values (which a couple of callers
go to the trouble of distinguishing), return values from an enum. Add
a docstring.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index dbb7104c04..021e1fc453 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -693,7 +693,7 @@ static int make_room_for_path(struct merge_options *o, const char *path) /* Make sure leading directories are created */ status = safe_create_leading_directories_const(path); if (status) { - if (status == -3) { + if (status == SCLD_EXISTS) { /* something else exists */ error(msg, path, _(": perhaps a D/F conflict?")); return -1; |