git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alex Riesen <raa.lkml@gmail.com>,
	git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH] Fix merge-recursive on cygwin: broken errno when unlinking a directory
Date: Thu, 19 Apr 2007 20:31:06 +0200	[thread overview]
Message-ID: <20070419183106.GB3396@uranus.ravnborg.org> (raw)
In-Reply-To: <alpine.LFD.0.98.0704190932450.9964@woody.linux-foundation.org>

> +		if (status == -3) {
> +			/* something else exists */
> +			error(msg, path, ": perhaps a D/F conflict?");

It would be more helpful it you spelled it out like:
Directory/File conflict?


> +			return -1;
> +		}
> +		die(msg, path, "");
> +	}
> +
> +	/* Successful unlink is good.. */
> +	if (!unlink(path))
> +		return 0;
> +	/* .. and so is no existing file */
> +	if (errno == ENOENT)
> +		return 0;
> +	/* .. but not some other error (who really cares what?) */
> +	return error(msg, path, ": perhaps a D/F conflict?");
ditto.

I know this was how it looked previously too but thats just a lame excuse.

	Sam

      reply	other threads:[~2007-04-19 18:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-18 22:33 [PATCH] Fix merge-recursive on cygwin: broken errno when unlinking a directory Alex Riesen
2007-04-18 23:04 ` Linus Torvalds
2007-04-18 23:40   ` Alex Riesen
2007-04-19  8:28     ` Alex Riesen
2007-04-19 16:39       ` Linus Torvalds
2007-04-19 18:31         ` Sam Ravnborg [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070419183106.GB3396@uranus.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=raa.lkml@gmail.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).