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

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

> diff --git a/setup.c b/setup.c
> index f512ea0..ffc30bf 100644
> --- a/setup.c
> +++ b/setup.c
> @@ -7,6 +7,25 @@ static int inside_work_tree = -1;
>  const char *prefix_path(const char *prefix, int len, const char *path)
>  {
>  	const char *orig = path;
> +	const char *work_tree = get_git_work_tree();
> +	if (is_absolute_path(path) && work_tree) {

Could you structure this part to read like this, into a separate
function:

static const char *strip_work_tree_path(const char *prefix, int len, const char *path)
{
	...
}

const char *prefix_path(const char *prefix, int len, const char *path)
{
	const char *orig = path;

	if (is_absolute_path(path))
		path = strip_work_tree_path(prefix, len, path);
	...


About the part that would be moved out of line with such a
restructuring,

> +		int n = strlen(work_tree);
> +		if (!strncmp(path, work_tree, n) && (path[n] == '/' || !path[n])) {
> +			if (path[n])
> +				path += n + 1;
> +			else
> +				path += n;
> +
> +			if (prefix && !strncmp(path, prefix, len - 1)) {
> +				if (path[len - 1] == '/')
> +					path += len;
> +				else
> +					if (!path[len - 1])
> +						path += len - 1;
> +			}

This makes me wonder what happens if after stripping the worktree path
path does not match the prefix.

  parent reply	other threads:[~2007-11-29  0:38 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
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 [this message]
2007-11-27  8:45 ` Johannes Sixt
2007-11-27 23:14   ` Robin Rosenberg
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=7vwss1zy26.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.