git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, matled@gmx.net
Subject: [PATCH] get_relative_cwd(): clarify why it handles dir == NULL
Date: Wed, 1 Aug 2007 19:26:59 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0708011926200.14781@racer.site> (raw)
In-Reply-To: <7vmyxb5h0g.fsf@assigned-by-dhcp.cox.net>


The comment did not make a good case why it makes sense.  It does so now.

Pointed out by Junio Hamano.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 dir.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dir.c b/dir.c
index b3329f4..791c566 100644
--- a/dir.c
+++ b/dir.c
@@ -646,7 +646,16 @@ file_exists(const char *f)
 /*
  * get_relative_cwd() gets the prefix of the current working directory
  * relative to 'dir'.  If we are not inside 'dir', it returns NULL.
- * As a convenience, it also returns NULL if 'dir' is already NULL.
+ *
+ * As a convenience, it also returns NULL if 'dir' is already NULL.  The
+ * reason for this behaviour is that it is natural for functions returning
+ * directory names to return NULL to say "this directory does not exist"
+ * or "this directory is invalid".  These cases are usually handled the
+ * same as if the cwd is not inside 'dir' at all, so get_relative_cwd()
+ * returns NULL for both of them.
+ *
+ * Most notably, get_relative_cwd(buffer, size, get_git_work_tree())
+ * unifies the handling of "outside work tree" with "no work tree at all".
  */
 char *get_relative_cwd(char *buffer, int size, const char *dir)
 {
-- 
1.5.3.rc3.112.gf60b6

  reply	other threads:[~2007-08-01 18:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-29 23:23 [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-07-29 23:24 ` [PATCH 1/9] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-07-29 23:24 ` [PATCH 2/9] Add functions get_relative_cwd() and is_inside_dir() Johannes Schindelin
2007-07-29 23:24 ` [PATCH 3/9] white space fixes in setup.c Johannes Schindelin
2007-07-29 23:25 ` [PATCH 4/9] Clean up work-tree handling Johannes Schindelin
2007-07-29 23:25 ` [PATCH 5/9] Add set_git_dir() function Johannes Schindelin
2007-07-29 23:25 ` [PATCH 6/9] work-trees are allowed inside a git-dir Johannes Schindelin
2007-07-29 23:25 ` [PATCH 7/9] init: use get_git_work_tree() instead of rolling our own Johannes Schindelin
2007-07-29 23:26 ` [PATCH 8/9] Fix t1501 for updated work-tree logic Johannes Schindelin
2007-07-29 23:26 ` [PATCH 9/9] Fix t1500 for sane work-tree behavior Johannes Schindelin
2007-07-29 23:29 ` [UNWANTED PATCH] Die if core.bare = true and core.worktree is set Johannes Schindelin
2007-08-01  0:28 ` [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-08-01  0:28   ` [PATCH 1/4] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-08-01  0:29   ` [PATCH 2/4] Add functions get_relative_cwd() and is_inside_dir() Johannes Schindelin
2007-08-01  4:22     ` Junio C Hamano
2007-08-01  5:35       ` Junio C Hamano
2007-08-01 11:38         ` Johannes Schindelin
2007-08-01 15:26         ` [NOT-SERIOUS PATCH] Make get_relative_cwd() not accept NULL for a directory Johannes Schindelin
2007-08-01 16:58           ` Junio C Hamano
2007-08-01 18:26             ` Johannes Schindelin [this message]
2007-08-01  0:29   ` [PATCH 3/4] Add set_git_dir() function Johannes Schindelin
2007-08-01  0:30   ` [PATCH 4/4] Clean up work-tree handling Johannes Schindelin
2007-08-01  5:17     ` Junio C Hamano
2007-08-01 11:46       ` Johannes Schindelin
2007-08-02  7:04         ` Junio C Hamano
2007-08-01  8:59     ` Junio C Hamano
2007-08-01 11:53       ` Johannes Schindelin
2007-08-01  0:55   ` [PATCH 0/9] work-tree clean ups Junio C Hamano
2007-08-01  1:13     ` Johannes Schindelin
2007-08-01 10:56       ` Johannes Schindelin

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=Pine.LNX.4.64.0708011926200.14781@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=matled@gmx.net \
    /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).