git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Make Git accept absolute path names for files within the work tree
Date: Mon, 26 Nov 2007 16:24:07 -0800	[thread overview]
Message-ID: <7vmyt0edso.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1196119109-27483-1-git-send-email-robin.rosenberg@dewire.com> (Robin Rosenberg's message of "Tue, 27 Nov 2007 00:18:29 +0100")

Robin Rosenberg <robin.rosenberg@dewire.com> writes:

> Was it this simple?
>
> diff --git a/setup.c b/setup.c
> index 43cd3f9..9b3a9ff 100644
> --- a/setup.c
> +++ b/setup.c
> @@ -6,6 +6,22 @@ static int inside_work_tree = -1;
>  
>  const char *prefix_path(const char *prefix, int len, const char *path)
>  {
> +	if (is_absolute_path(path)) {
> +		const char *work_tree = get_git_work_tree();
> +		int n = strlen(work_tree);
> +		if (!strncmp(path, work_tree, n) && (path[n] == '/' || !path[n])) {
> +			if (path[n])
> +				path += 1;
> +			path += n;
> +			if (prefix && !strncmp(path, prefix, len - 1)) {
> +			    if (path[len - 1] == '/')
> +				    path += len;
> +			    else
> +				    if (!path[len - 1])
> +					    path += len - 1;
> +			}
> +		}
> +	}
>  	const char *orig = path;

Decl after statement.

I do not think there is fundamental reason to object to this change, as
long as the prefixing is done to the path that is trying to name a path
in the working tree.

Also some codepath that does not require any work tree may want to call
prefix_path().  I do not know what would happen in such a case.

Although I didn't look at all the callers, I think the caller from
config.c is not talking about a path in the work tree, and not all users
of config.c need to have work-tree.

  reply	other threads:[~2007-11-27  0:24 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-26 23:18 [PATCH] Make Git accept absolute path names for files within the work tree Robin Rosenberg
2007-11-27  0:24 ` Junio C Hamano [this message]
2007-11-27 23:20   ` Robin Rosenberg
2007-11-27 23:24   ` Robin Rosenberg
2007-11-28  8:43     ` Junio C Hamano
2007-11-29  1:15       ` Robin Rosenberg
2007-11-29  2:05         ` Junio C Hamano
2007-11-29  0:37     ` Junio C Hamano
2007-11-27  8:45 ` Johannes Sixt
2007-11-27 23:14   ` Robin Rosenberg
  -- strict thread matches above, loose matches on Subject: below --
2007-12-03  0:52 Incorrect git-blame result if I use full path to file Anatol Pomozov
2007-12-03  2:49 ` Jeff King
2007-12-03  6:55   ` Robin Rosenberg
2007-12-03 20:53     ` [PATCH] Make Git accept absolute path names for files within the work tree Robin Rosenberg
2007-12-03 23:03       ` Junio C Hamano
2007-12-04  1:43       ` Jeff King
2007-12-04  2:17         ` Johannes Schindelin
2007-12-04  6:42           ` Robin Rosenberg
2007-12-04 11:50             ` Johannes Schindelin
2007-12-04 15:59               ` Linus Torvalds
2007-12-04 22:08                 ` Jeff King
2007-12-04 22:52                   ` Linus Torvalds
2007-12-06  6:12                     ` Jeff King

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=7vmyt0edso.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=robin.rosenberg@dewire.com \
    /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).