[PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'

2015-08-04 Thread Patrick Steinhardt
Signed-off-by: Patrick Steinhardt 
---
 Documentation/git-worktree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 3387e2f..566ca92 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path 
belongs to
 $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
 inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
 
-To prevent a $GIT_DIR/worktrees entry from from being pruned (which
+To prevent a $GIT_DIR/worktrees entry from being pruned (which
 can be useful in some situations, such as when the
 entry's working tree is stored on a portable device), add a file named
 'locked' to the entry's directory. The file contains the reason in
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file

2015-08-04 Thread Patrick Steinhardt
The documentation of git-worktree refers to the 'locked' file as
'lock'. Fix this to say 'locked' instead.

Signed-off-by: Patrick Steinhardt 
---
 Documentation/git-worktree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 566ca92..3fedd9e 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.
 
 If a linked working tree is stored on a portable device or network share
 which is not always mounted, you can prevent its administrative files from
-being pruned by creating a file named 'lock' alongside the other
+being pruned by creating a file named 'locked' alongside the other
 administrative files, optionally containing a plain text reason that
 pruning should be suppressed. See section "DETAILS" for more information.
 
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 6/6] clone: add tests for cloning with empty path

2015-08-04 Thread Patrick Steinhardt
Test behavior of `git clone` when working with an empty path
component. This may be the case when cloning a file system's root
directory or from a remote server's root.

Signed-off-by: Patrick Steinhardt 
---
 t/t1509-root-worktree.sh | 43 +++
 1 file changed, 43 insertions(+)

diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index 553a3f6..d521ca3 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -237,6 +237,49 @@ test_foobar_foobar
 
 test_expect_success 'cleanup' 'rm -rf /.git'
 
+say "clone .git at root without reponame"
+
+test_expect_success 'go to /' 'cd /'
+test_expect_success 'setup' '
+   echo "Initialized empty Git repository in /.git/" > expected &&
+   git init > result &&
+   test_cmp expected result
+'
+
+test_clone_expect_dir() {
+   URL="$1"
+   DIR="$2"
+   cat <<-EOF >expected &&
+   Cloning into '$DIR'...
+   warning: You appear to have cloned an empty repository.
+   EOF
+   git clone "$URL" >result 2>&1 &&
+   rm -rf "$DIR" &&
+   test_cmp expected result
+}
+
+test_expect_success 'go to /clones' 'mkdir /clones && cd /clones'
+test_expect_success 'simple clone of /' '
+   cat <<-EOF >expected &&
+   fatal: No directory name could be guessed.
+   Please specify a directory on the command line
+   EOF
+   test_expect_code 128 git clone / >result 2>&1 &&
+   test_cmp expected result'
+
+test_expect_success 'clone with file://host/' '
+   test_clone_expect_dir file://127.0.0.1/ 127.0.0.1'
+test_expect_success 'clone with file://user@host/' '
+   test_clone_expect_dir file://user@127.0.0.1/ 127.0.0.1'
+test_expect_success 'clone with file://user:password@host/' '
+   test_clone_expect_dir file://user:password@127.0.0.1/ 127.0.0.1'
+test_expect_success 'clone with file://host:port/' '
+   test_clone_expect_dir file://127.0.0.1:/ 127.0.0.1'
+test_expect_success 'clone with file://user:password@host:port' '
+   test_clone_expect_dir file://user:password@127.0.0.1:/ 127.0.0.1'
+
+test_expect_success 'cleanup' 'rm -rf /.git /clones'
+
 say "auto bare gitdir"
 
 # DESTROY!
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 4/6] clone: do not use port number as dir name

2015-08-04 Thread Patrick Steinhardt
If the URI contains a port number and the URI's path component is
empty we fail to guess a sensible directory name. E.g. cloning a
repository 'ssh://example.com:/' we guess a directory name
'' where we would want the hostname only, e.g. 'example.com'.

Fix this by stripping trailing port numbers.

Signed-off-by: Patrick Steinhardt 
---
 builtin/clone.c | 17 +
 1 file changed, 17 insertions(+)

diff --git a/builtin/clone.c b/builtin/clone.c
index 794a933..a163797 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -181,6 +181,23 @@ static char *guess_dir_name(const char *repo, int 
is_bundle, int is_bare)
}
 
/*
+* Strip trailing port number if we've got only a
+* hostname (that is, there is no dir separator but a
+* colon). This check is required such that we do not
+* strip URI's like '/foo/bar:.git', which should
+* result in a dir '' being guessed due to backwards
+* compatibility.
+*/
+   if (memchr(start, '/', end - start) == NULL
+   && memchr(start, ':', end - start) != NULL) {
+   ptr = end;
+   while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':')
+   ptr--;
+   if (start < ptr && ptr[-1] == ':')
+   end = ptr - 1;
+   }
+
+   /*
 * Find last component. To remain backwards compatible we
 * also regard colons as path separators, such that
 * cloning a repository 'foo:bar.git' would result in a
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 5/6] clone: abort if no dir name could be guessed

2015-08-04 Thread Patrick Steinhardt
Due to various components of the URI being stripped off it may
happen that we fail to guess a directory name. We currently error
out with a message that it is impossible to create the working
tree '' in such cases. Instead, error out early with a sensible
error message hinting that a directory name should be specified
manually on the command line.

Signed-off-by: Patrick Steinhardt 
---
 builtin/clone.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/builtin/clone.c b/builtin/clone.c
index a163797..2adc712 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -217,6 +217,10 @@ static char *guess_dir_name(const char *repo, int 
is_bundle, int is_bare)
 */
strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
 
+   if (!len || (len == 1 && *start == '/'))
+   die("No directory name could be guessed.\n"
+   "Please specify a directory on the command line");
+
if (is_bare)
dir = xstrfmt("%.*s.git", (int)len, start);
else
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 1/6] tests: fix broken && chains in t1509-root-worktree

2015-08-04 Thread Patrick Steinhardt
Signed-off-by: Patrick Steinhardt 
---
 t/t1509-root-worktree.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index b6977d4..0c80129 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -125,7 +125,7 @@ fi
 ONE_SHA1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d
 
 test_expect_success 'setup' '
-   rm -rf /foo
+   rm -rf /foo &&
mkdir /foo &&
mkdir /foo/bar &&
echo 1 > /foo/foome &&
@@ -218,7 +218,7 @@ unset GIT_WORK_TREE
 
 test_expect_success 'go to /' 'cd /'
 test_expect_success 'setup' '
-   rm -rf /.git
+   rm -rf /.git &&
echo "Initialized empty Git repository in /.git/" > expected &&
git init > result &&
test_cmp expected result
@@ -241,8 +241,8 @@ say "auto bare gitdir"
 
 # DESTROY!
 test_expect_success 'setup' '
-   rm -rf /refs /objects /info /hooks
-   rm /*
+   rm -rf /refs /objects /info /hooks &&
+   rm /* &&
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 3/6] clone: do not include authentication data in guessed dir

2015-08-04 Thread Patrick Steinhardt
If the URI contains authentication data and the URI's path
component is empty we fail to guess a sensible directory name.
E.g. cloning a repository 'ssh://user:passw...@example.com/' we
guess a directory name 'passw...@example.com' where we would want
the hostname only, e.g. 'example.com'.

Fix this by first skipping authentication data.

Signed-off-by: Patrick Steinhardt 
---
 builtin/clone.c | 46 +++---
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/builtin/clone.c b/builtin/clone.c
index a72ff7e..794a933 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -146,35 +146,59 @@ static char *get_repo_path(const char *repo, int 
*is_bundle)
 
 static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
 {
-   const char *end = repo + strlen(repo), *start;
+   const char *end = repo + strlen(repo), *start, *ptr;
size_t len;
char *dir;
 
/*
+* Skip scheme.
+*/
+   start = strstr(repo, "://");
+   if (start == NULL)
+   start = repo;
+   else
+   start += 3;
+
+   /*
+* Skip authentication data.
+*/
+   ptr = start;
+   while (ptr < end && !is_dir_sep(*ptr) && *ptr != '@')
+   ptr++;
+   if (*ptr == '@')
+   start = ptr + 1;
+
+   /*
 * Strip trailing spaces, slashes and /.git
 */
-   while (repo < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
+   while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
end--;
-   if (end - repo > 5 && is_dir_sep(end[-5]) &&
+   if (end - start > 5 && is_dir_sep(end[-5]) &&
!strncmp(end - 4, ".git", 4)) {
end -= 5;
-   while (repo < end && is_dir_sep(end[-1]))
+   while (start < end && is_dir_sep(end[-1]))
end--;
}
 
/*
-* Find last component, but be prepared that repo could have
-* the form  "remote.example.com:foo.git", i.e. no slash
-* in the directory part.
+* Find last component. To remain backwards compatible we
+* also regard colons as path separators, such that
+* cloning a repository 'foo:bar.git' would result in a
+* directory 'bar' being guessed. This is skipped if the
+* current path does not contain any path separators.
 */
-   start = end;
-   while (repo < start && !is_dir_sep(start[-1]) && start[-1] != ':')
-   start--;
+   if (memchr(start, '/', end - start) != NULL
+   || memchr(start, ':', end - start) != NULL) {
+   start = end;
+   while (!is_dir_sep(start[-1]) && start[-1] != ':')
+   start--;
+   }
+   len = end - start;
 
/*
 * Strip .{bundle,git}.
 */
-   strip_suffix(start, is_bundle ? ".bundle" : ".git" , &len);
+   strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
 
if (is_bare)
dir = xstrfmt("%.*s.git", (int)len, start);
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 2/6] tests: fix cleanup after tests in t1509-root-worktree

2015-08-04 Thread Patrick Steinhardt
During cleanup we do a simple 'rm /*' to remove leftover files
from previous tests. As 'rm' errors out when there is anything it
cannot delete and there are directories present at '/' it will
throw an error, causing the '&&' chain to fail.

Fix this by explicitly removing the files.

Signed-off-by: Patrick Steinhardt 
---
 t/t1509-root-worktree.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index 0c80129..553a3f6 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -242,7 +242,7 @@ say "auto bare gitdir"
 # DESTROY!
 test_expect_success 'setup' '
rm -rf /refs /objects /info /hooks &&
-   rm /* &&
+   rm -f /expected /ls.expected /me /result &&
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 0/6] fix repo name when cloning a server's root

2015-08-04 Thread Patrick Steinhardt
This is the third version of this patch series. It aims to
improve guessing directory names such that we do not include
authentication data and port numbers in them.

This version drops the patches exposing 'parse_connect_url()' and
instead does the stripping of authentification data and port
inside the URI in 'guess_dir_name()'.

Actually I'm not that happy with the patch as it currently stands
as it requires a lot of complexity to correctly strip the URI
such that we do not mishandle several corner cases. At least I
didn't find any shorter way of doing what I want without breaking
backwards compatibility. I'll try to explain why the more complex
ways of handling the URI are required:

 - The naive way of just adding '@' as path separator would break
   cloning repositories like '/foo/b...@baz.git' (which would
   currently become 'bar@baz' but would become 'baz' only).

 - Skipping the scheme initially is required because without it we
   wouldn't be able to scan until the next dir separator in the
   host part when stripping authentication information.

 - First checking for '/' in the current stripped URI when we
   want to remove the port is required because we do not want to
   strip port numbers when cloning from something like
   '/foo/bar:.git' (which would currently become '' but
   would then be stripped of the ':' part and instead become
   'bar'). Still, this breaks on cloning a bare repository in the
   current dir (e.g. cloning 'bar:.git', which should become
   '' because it is not a port number but would become
   'bar').

As you can see, there is a lot of complexity in there and I'm not
convinced this is better than just exposing
'parse_connect_url()', which already handles everything for us.
Maybe I'm just being blind for the obvious solution here, though.

Patrick Steinhardt (6):
  tests: fix broken && chains in t1509-root-worktree
  tests: fix cleanup after tests in t1509-root-worktree
  clone: do not include authentication data in guessed dir
  clone: do not use port number as dir name
  clone: abort if no dir name could be guessed
  clone: add tests for cloning with empty path

 builtin/clone.c  | 67 
 t/t1509-root-worktree.sh | 51 +---
 2 files changed, 103 insertions(+), 15 deletions(-)

-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] git_open_noatime: return with errno=0 on success

2015-08-04 Thread Clemens Buchacher
In read_sha1_file_extended we die if read_object fails with a fatal
error. We detect a fatal error if errno is non-zero and is not
ENOENT. If the object could not be read because it does not exist,
this is not considered a fatal error and we want to return NULL.

Somewhere down the line, read_object calls git_open_noatime to open
a pack index file, for example. We first try open with O_NOATIME.
If O_NOATIME fails with EPERM, we retry without O_NOATIME. When the
second open succeeds, errno is however still set to EPERM from the
first attempt. When we finally determine that the object does not
exist, read_object returns NULL and read_sha1_file_extended dies
with a fatal error:

fatal: failed to read object : Operation not permitted

Fix this by resetting errno to zero before we call open again.

Cc: Linus Torvalds 
Signed-off-by: Clemens Buchacher 
---

This is a re-submission without changes except for a typo fix in the
comments (thanks Eric). The original submission received no other
comments, but I think it is a clear improvement and I hope it was just
missed the first time.

Best regards,
Clemens

 sha1_file.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sha1_file.c b/sha1_file.c
index 77cd81d..62b7ad6 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1453,6 +1453,7 @@ int git_open_noatime(const char *name)
static int sha1_file_open_flag = O_NOATIME;
 
for (;;) {
+   errno = 0;
int fd = open(name, O_RDONLY | sha1_file_open_flag);
if (fd >= 0)
return fd;
-- 
1.9.4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: git svn clone fails

2015-08-04 Thread Jörg Schaible
Hmmm. Is this the proper channel to report issues or should I go somewhere 
else?

Jörg Schaible wrote:

> Hello guys,
> 
> we have to turn some projects managed by Subversion into a GIT-based
> solution. However the conversion unfortunately fails with an error:
> 
> == %< ==
> [...]
> Found branch parent: (refs/remotes/origin/tags/v_2.1.1)
> 450fa2c84a8fc087a2a66e5fb3d6d22096671f81
> Following parent with do_switch
> M   changes.xml
> M   pom.xml
> couldn't truncate file at /usr/lib64/perl5/vendor_perl/5.20.2/Git.pm line
> 1325.
> $ git --version
> git version 2.5.0
> == %< ==
> 
> Apart from the line number, the same error occurs also with GIT version
> 2.4.6 and 2.3.6 (latest stable version in Gentoo).
> 
> The command to create the GIT repository was:
> == %< ==
> $ git svn clone http://websvn/svn/essvn/standard/java-commons/lang -s
> --no- metadata --preserve-empty-dirs -A ~/tmp/authors.txt commons-lang
> == %< ==
> 
> Note, that the command succeeds even for 2.4.6 if we drop the --preserve-
> empty-dirs option - at the cost of some empty directories which are used
> to trigger profiles for Maven; i.e. without those we cannot reproduce
> released versions.
> 
> Cheers,
> Jörg


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


допоможіть сайту нашої школи http://154school.kiev.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок,

2015-08-04 Thread admin
Доброго дня, 
будь ласка, просимо переглянути наш шкільний сайт,
якщо це не важко для вас,
http://154school.kiev.ua/ - будь ласка, відкрийте його для перегляду 
однієї-двох сторінок,
і на будь-якій сторінці один раз натисніть на рекламний банер, який вам 
найбільш цікавий,
це Ваша допомога, щоб ми могли заплатити за хостинг нашого шкільного сайту,
дякуємо,
системний адміністратор
ad...@154school.kiev.ua
http://154school.kiev.ua/

hello, 
our school site require you view,
please, if it's not hard for you, 
http://154school.kiev.ua/ - please open it for viewing our site - one or two 
pages,
and on any page, 
click once on the advertising banner that most interesting for you,
it is your help to pay for hosting our school site,
thank you
system Administrator
ad...@154school.kiev.ua
http://154school.kiev.ua/

 
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v4] clone: simplify string handling in guess_dir_name()

2015-08-04 Thread Sebastian Schuberth
On Tue, Aug 4, 2015 at 6:34 AM, Lukas Fleischer  wrote:

> I am currently on vacation and cannot bisect or debug this but I am
> pretty confident that this patch changes the behaviour of directory name
> guessing. With Git 2.4.6, cloning http://foo.bar/foo.git/ results in a
> directory named foo and with Git 2.5.0, the resulting directory is
> called foo.git.
>
> Note how the end variable is decreased when the repository name ends
> with a slash but that isn't taken into account when simply using
> strip_suffix() later...
>
> Is this intended?

I did not intend this change in behavior, and I can confirm that
reverting my patch restores the original behavior. Thanks for bringing
this to my attention, I'll work on a patch.

-- 
Sebastian Schuberth
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [git-p4] import with labels fails when commit is not transferred

2015-08-04 Thread Luke Diamand

On 04/07/15 04:27, Luke Diamand wrote:

Sorry for not replying earlier, and thanks for taking the time to
investigate this!

It's a pretty subtle corner case: I think a test case would be useful.
I'm going to try to put something together, unless you beat me to it!

(I think t9811-git-p4-label-import.sh is the one that needs extending).


I've been looking into this a bit more, and I think that you don't need 
a try/except - it's enough just to add "ignore_error=True" to the call 
to read_lines.


It also looks like this is a general problem of importing a label where 
the revision doesn't exist in git. For example, if you create a p4 
label, then clone at the revision after that, you will get the problem.


I've got a test case and a modified git-p4.py, but I haven't yet got to 
the point where I'm convinced it works. I think the fix is pretty much 
what you've shown (replacing try-except with ignore_error) but I'd like 
my test case to be a bit more convincing.


Thanks!
Luke



On 30/06/15 09:45, Holl, Marcus wrote:

Hi,

I have an issue with the git p4 tooling regarding import of labels.

My git version is 2.4.5

I try to transform a perforce repository. My command line is:
git p4 clone --verbose --detect-branches --import-local
--import-labels --destination  //depot@all


The relevant parts in the gitconfig is:
[git-p4]
 branchUser = 


For that user there is a branch mapping defined with a lot of entries
like:
//depot/trunk/... //depot/branches/ipro-status-8-2--branch/...
//depot/trunk/... //depot/branches/9-0-preview/...
//depot/trunk/... //depot/branches/release-8-0-0-branch/...
//depot/trunk/... //depot/branches/release-8-1-0-branch/...
//depot/trunk/... //depot/branches/release-8-2-0-branch/...
//depot/trunk/... //depot/branches/release-8-3-0-branch/...
//depot/trunk/... //depot/branches/release-8-4-branch/...
//depot/trunk/... //depot/branches/release-8-5-branch/...
...


The import fails with the log output that can be found at the bottom
of this mail.

git log -all -grep "\[git-p4:.*change\ =\ 69035\]" reports nothing.
The commit is not contained in the git repository.

p4 describe for changelist 69035 returns a reasonable result. This
change contains one file located at a path in the perforce folder
structure that comes without corresponding entry in the perforce
branch mapping.

According to the given branch mapping it looks reasonable to me that
the change is omitted in the git repository. But in my opinion the
import should not fail in such a case.

A reasonable behavior would be to blacklist the label (add it to
git-p4.ignoredP4Labels) and to continue with the next label.

Attached is a proposal for a fix that needs to be carefully reviews
since I'm not that experienced with python.

Other proposals for resolving this issue are highly appreciated.

Thanks a lot and best regards,
Marcus Holl


Log output:

Reading pipe: ['git', 'rev-list', '--max-count=1', '--reverse',
':/\\[git-p4:.*change = 69035\\]']
fatal: ambiguous argument ':/\[git-p4:.*change = 69035\]': unknown
revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git  [...] -- [...]'
ied with change: 69078, original Date: 2010-04-22T09:07:24.00Z\n',
'Update': '2013/11/02 07:40:31', 'Label': 'release-8-1-0-976',
'Access': '2015/06/26 14:50:15', 'Owner': 'svn_p4_converter',
'Options': 'unlocked noautoreload'}
p4 label release-8-1-0-976 mapped to git commit
82a11809928b86a7bde03cf486428de52ab3380f
writing tag release-9-0-0-179 for commit
fb8370cd04806686c567ad720d065436f2334b4a
labelDetails= {'code': 'stat', 'Description': 'Created or modified
with change: 96984, original Date: 2011-12-22T16:01:25.681427Z\n',
'Update': '2013/11/02 15:15:50', 'Label': 'release-9-0-0-179',
'Access': '2015/06/26 14:50:16', 'Owner': 'build', 'Options':
'unlocked noautoreload'}
p4 label release-9-0-0-179 mapped to git commit
fb8370cd04806686c567ad720d065436f2334b4a
Traceback (most recent call last):
   File "/usr/lib/git/git-p4", line 3297, in 
 main()
   File "/usr/lib/git/git-p4", line 3291, in main
 if not cmd.run(args):
   File "/usr/lib/git/git-p4", line 3165, in run
 if not P4Sync.run(self, depotPaths):
   File "/usr/lib/git/git-p4", line 3045, in run
 self.importP4Labels(self.gitStream, missingP4Labels)
   File "/usr/lib/git/git-p4", line 2421, in importP4Labels
 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist])
   File "/usr/lib/git/git-p4", line 138, in read_pipe
 die('Command failed: %s' % str(c))
   File "/usr/lib/git/git-p4", line 106, in die
 raise Exception(msg)
Exception: Command failed: ['git', 'rev-list', '--max-count=1',
'--reverse', ':/\\[git-p4:.*change = 69035\\]']





--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


<    1   2