On Fri, Sep 28, 2012 at 10:54:29PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> >> + if (opt->reflog_info) {
> >> + strbuf_addstr(&buf, "reflog ");
> >> + get_reflog_message(&buf, opt->reflog_info);
> >> + strbuf_addch(&buf, '\n');
> >> + strbuf_addst
This test used to explicitly resolve symlinks in the paths derived
from TRASH_DIRECTORY that were written to GIT_CEILING_DIRECTORIES,
because the code handling GIT_CEILING_DIRECTORIES was confused by
symlinks. This is no longer necessary.
Signed-off-by: Michael Haggerty
---
t/t1504-ceiling-dirs
Use string_list_longest_prefix() in the implementation of
longest_ancestor_length(), instead of an equivalent loop.
Signed-off-by: Michael Haggerty
---
path.c | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/path.c b/path.c
index a56c64a..b20f2fb 100644
--- a/
longest_ancestor_length() relies on a textual comparison of directory
parts to find the part of path that overlaps with one of the paths in
prefix_list. But this doesn't work if any of the prefixes involves a
symbolic link, because the directories will look different even though
they might logical
Previously we stripped off any slashes that were present. Instead,
add a slash if it is missing. This removes the need for an extra
check that path has a slash following the prefix and makes the
handling of the root directory more natural, making the way clear to
use string_list_longest_prefix().
Separate the step of filtering and normalizing elements of the
prefixes list from the iteration that looks for the longest prefix.
This will help keep the function testable after we not only normalize
the paths, but also convert them into real paths.
Signed-off-by: Michael Haggerty
---
path.c |
Signed-off-by: Michael Haggerty
---
path.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/path.c b/path.c
index cbbdf7d..f455e8e 100644
--- a/path.c
+++ b/path.c
@@ -12,6 +12,7 @@
*/
#include "cache.h"
#include "strbuf.h"
+#include "string-list.h"
The function is like real_path(), except that it returns NULL on error
instead of dying.
Signed-off-by: Michael Haggerty
---
abspath.c | 5 +
cache.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/abspath.c b/abspath.c
index f8a526f..40cdc46 100644
--- a/abspath.c
+++ b/abspath.c
@@
Signed-off-by: Michael Haggerty
---
abspath.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/abspath.c b/abspath.c
index a7ab8e9..f8a526f 100644
--- a/abspath.c
+++ b/abspath.c
@@ -35,7 +35,14 @@ static const char *real_path_internal(const char *path, int
die_on_error)
{
st
It accepts a new parameter, die_on_error. If die_on_error is false,
it simply cleans up after itself and returns NULL rather than dying.
Signed-off-by: Michael Haggerty
---
abspath.c | 93 ---
1 file changed, 72 insertions(+), 21 delet
v2 of the series, with the following changes from v1:
Patch 2/9 is new.
Patch 4/9: remove an unnecessary memcpy(). (This change doesn't
affect the tip of the branch because the memcpy() was removed anyway
in the second-to-last patch.)
Patch 8/9: remove a superfluous "len++", and improve the exc
On Sat, Sep 29, 2012 at 12:54 PM, Junio C Hamano wrote:
>> I like how callers not doing a reflog walk do not have to pay the price
>> to do the extra allocating. We could further limit it to only when
>> --grep-reflog is in effect, but I guess that would mean wading through
>> grep_filter's patter
Jeff King writes:
>> +if (opt->reflog_info) {
>> +strbuf_addstr(&buf, "reflog ");
>> +get_reflog_message(&buf, opt->reflog_info);
>> +strbuf_addch(&buf, '\n');
>> +strbuf_addstr(&buf, commit->buffer);
>> +}
>> +if (buf.len)
>> +
On 09/28/2012 12:51 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> longest_ancestor_length() relies on a textual comparison of directory
>> parts to find the part of path that overlaps with one of the paths in
>> prefix_list. But this doesn't work if any of the prefixes involves a
>>
Michael Haggerty writes:
> On 09/28/2012 12:48 AM, Junio C Hamano wrote:
>> Michael Haggerty writes:
>>
>>> - for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
>>> - for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
>>> - len = colon - ceil;
>>> + strin
Michael Haggerty writes:
>> The patch makes sense, but while you are touching this code, I have
>> to wonder if there is an easy way to tell, before entering the loop,
>> if we have to chdir() around in the loop. That would allow us to
>> hoist the getcwd() that is done only so that we can come
Nguyễn Thái Ngọc Duy writes:
> On Sat, Sep 29, 2012 at 12:55 AM, Junio C Hamano wrote:
>> For that to happen, the code _must_ know what kind of headers we
>> would support; discarding the existing enum is going in a wrong
>> direction.
>
> Or what kind of manipulation is required for a header.
On Sat, Sep 29, 2012 at 11:41:28AM +0700, Nguyen Thai Ngoc Duy wrote:
> @@ -2210,10 +2213,23 @@ static int rewrite_parents(struct rev_info *revs,
> struct commit *commit)
>
> static int commit_match(struct commit *commit, struct rev_info *opt)
> {
> + int retval;
> + struct strbuf buf
On 09/28/2012 12:48 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> -for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
>> -for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
>> -len = colon - ceil;
>> +string_list_split(&prefixes, prefix_
On Sat, Sep 29, 2012 at 11:41:27AM +0700, Nguyen Thai Ngoc Duy wrote:
> diff --git a/grep.c b/grep.c
> index 898be6e..8d73995 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -720,7 +720,14 @@ static int match_one_pattern(struct grep_pat *p, char
> *bol, char *eol,
> if (strncmp(bol, field
On 09/27/2012 11:27 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> @@ -54,20 +73,36 @@ const char *real_path(const char *path)
>> }
>>
>> if (*buf) {
>> -if (!*cwd && !getcwd(cwd, sizeof(cwd)))
>> -die_errno ("
Similar to --author/--committer which filters commits by author and
committer header fields. --grep-reflog adds a fake "reflog" header to
commit and a grep filter to search on that line.
All rules to --author/--committer apply except no timestamp stripping.
Signed-off-by: Nguyễn Thái Ngọc Duy
--
Notes are shown after commit body. From user perspective it looks
pretty much like commit body and they may assume --grep would search
in that part too. Make it so.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
revision.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/revision.c b/revision.
grep supports only author and committer headers, which have the same
special treatment that later headers may or may not have. Check for
field type and only strip_timestamp() when the field is either author
or committer.
GREP_HEADER_FIELD_MAX is put in the grep_header_field enum to be
calculated a
On Sat, Sep 29, 2012 at 12:55 AM, Junio C Hamano wrote:
> For that to happen, the code _must_ know what kind of headers we
> would support; discarding the existing enum is going in a wrong
> direction.
Or what kind of manipulation is required for a header. The caller can
decide if it wants such m
Junio C Hamano writes:
> Jeff King writes:
>
>> On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
>>
>>> Jeff King writes:
>>>
>>> > +proc refresh_index {} {
>>> > +global need_index_refresh
>>> > +if { $need_index_refresh } {
>>> > + exec sh -c "git update-index --refres
Jeff King writes:
> I think the weird tcl-catches-stderr thing kicks in (at least it did for
> me in a simple experiment). But like I said, I am not an expert.
OK, I'll believe you ;-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.k
On Fri, Sep 28, 2012 at 04:02:32PM -0700, Junio C Hamano wrote:
> >> Jeff King writes:
> >>
> >> > +proc refresh_index {} {
> >> > +global need_index_refresh
> >> > +if { $need_index_refresh } {
> >> > +exec sh -c "git update-index --refresh >/dev/null 2>&1 || true"
> >>
> >> I
Jeff King writes:
> On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
>
>> Jeff King writes:
>>
>> > +proc refresh_index {} {
>> > +global need_index_refresh
>> > +if { $need_index_refresh } {
>> > + exec sh -c "git update-index --refresh >/dev/null 2>&1 || true"
>>
>> I
On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
> Jeff King writes:
>
> > +proc refresh_index {} {
> > +global need_index_refresh
> > +if { $need_index_refresh } {
> > + exec sh -c "git update-index --refresh >/dev/null 2>&1 || true"
>
> I think the usual idiom for ign
Jeff King writes:
> +proc refresh_index {} {
> +global need_index_refresh
> +if { $need_index_refresh } {
> + exec sh -c "git update-index --refresh >/dev/null 2>&1 || true"
I think the usual idiom for ignoring errors is to use catch around exec,
avoiding the extra shell wrapper:
On Fri, Sep 28, 2012 at 07:55:10PM +0100, Scott Batchelor wrote:
> I'm fairly new to git and am witnessing some strange behavior with git
> that I suspect may be a bug. Can anyone set my mind at rest.
It's not a bug.
> Every so often (I've not quite figured out the exact set of
> circumstances y
Jeff King writes:
> Potentially the "reload" command should reset the need_index_refresh
> flag, too.
Yeah, I think that is a sane enhancement to think about.
> gitk | 10 ++
> 1 file changed, 10 insertions(+)
>
> diff --git a/gitk b/gitk
> index 379582a..561be23 100755
> --- a/gitk
>
On Fri, Sep 28, 2012 at 04:23:30PM -0400, Jeff King wrote:
> > I'm trying to figure out what the problem with "git diff-files" is
> > because gitk uses it under the hood, and I think that gitk is
> > reporting erroneous changes (which are also reset by performing a
> > "git status" in the repo) i
Scott Batchelor writes:
> I'm fairly new to git and am witnessing some strange behavior with git
> that I suspect may be a bug. Can anyone set my mind at rest.
>
> Every so often (I've not quite figured out the exact set of
> circumstances yet)
Figure that circumstances out. That is the key to
On Fri, Sep 28, 2012 at 12:23:47PM -0700, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
> >> SZEDER Gábor writes:
> >>
> >> > To simulate the the user hit 'git , one of the completion tests
> >
> > s/the the/that the/
> >
> >>
On Fri, Sep 28, 2012 at 12:49:25PM -0700, Junio C Hamano wrote:
> >> And these "words" can be split at $IFS boundaries without any
> >> issues? IOW, nobody would ever want to make words array in the
> >> run_completion function to ['git' 'foo bar' 'baz']?
> >
> > It might be simpler to just conve
Jeff King writes:
> On Fri, Sep 28, 2012 at 12:23:47PM -0700, Junio C Hamano wrote:
>
>> >> > @@ -57,7 +57,7 @@ run_completion ()
>> >> > test_completion ()
>> >> > {
>> >> > test $# -gt 1 && echo "$2" > expected
>> >> > - run_completion "$@" &&
>> >> > + run_completion $1 &
On Fri, Sep 28, 2012 at 6:46 PM, Angelo Borsotti
wrote:
> Hi Ben,
>
> I am running git gui on Windows 7. Are you running it on Linux?
>
> -Angelo
Mac OS X
// Ben
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo
Am 28.09.2012 14:04, schrieb Pete Wyckoff:
> It does not notice chmod +x or -x; there is nothing
> for this test to do.
>
> Signed-off-by: Pete Wyckoff
> ---
> t/t9815-git-p4-submit-fail.sh | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/t9815-git-p4-submit-fail.sh
On Fri, Sep 28, 2012 at 12:23:47PM -0700, Junio C Hamano wrote:
> >> > @@ -57,7 +57,7 @@ run_completion ()
> >> > test_completion ()
> >> > {
> >> > test $# -gt 1 && echo "$2" > expected
> >> > -run_completion "$@" &&
> >> > +run_completion $1 &&
> >> > test_cmp
SZEDER Gábor writes:
> On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
>> SZEDER Gábor writes:
>>
>> > To simulate the the user hit 'git , one of the completion tests
>
> s/the the/that the/
>
>> > sets up the rather strange command line
>> >
>> > git ""
>> >
>> > i.e. the sec
Pete Wyckoff writes:
> Simplify the code a bit by using an existing function.
>
> Signed-off-by: Pete Wyckoff
> ---
> t/lib-git-p4.sh | 11 ++-
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
> index 7061dce..890ee60 100644
> --- a/t/
Pete Wyckoff writes:
> The output was a bit nonsensical, including a bare %d. Fix it
> to make it easier to understand.
>
> Signed-off-by: Pete Wyckoff
> ---
> git-p4.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index eef5c94..d7ee4b4 10
Pete Wyckoff writes:
> Use the standard client_view function from lib-git-p4.sh
> instead of building one by hand. This requires a bit of
> rework, using the current value of $P4CLIENT for the client
> name. It also reorganizes the test to isolate changes to
> $P4CLIENT and $cli in a subshell.
Pete Wyckoff writes:
> Depot paths must start with //. Exit with a better explanation
> when a bad depot path is supplied.
>
> Signed-off-by: Pete Wyckoff
> ---
> git-p4.py | 1 +
> t/t9800-git-p4-basic.sh | 5 +
> 2 files changed, 6 insertions(+)
>
> diff --git a/git-p4.py b
Pete Wyckoff writes:
> This series fixes problems in git-p4, and its tests, so that
> git-p4 works on the cygwin platform.
>
> See the wiki for info on how to get started on cygwin:
>
> https://git.wiki.kernel.org/index.php/GitP4
>
> Testing by people who use cygwin would be appreciated. It
On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > To simulate the the user hit 'git , one of the completion tests
s/the the/that the/
> > sets up the rather strange command line
> >
> > git ""
> >
> > i.e. the second word on the command line consists
Hi Ben,
I run the same test on Linux, and have got the same results as you did.
So the problem is only on Windows.
-Angelo
--
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/majordo
SZEDER Gábor writes:
> To simulate the the user hit 'git , one of the completion tests
> sets up the rather strange command line
>
> git ""
>
> i.e. the second word on the command line consists of two double
> quotes. However, this is not what happens for real, because after
> 'git ' the secon
On Thu, Sep 27, 2012 at 5:20 AM, Chris Webb wrote:
> You're right that rebase --root without --onto always creates a brand new
> root as a result of the implementation using a sentinel commit. Clearly this
> is what's wanted with --interactive
That's not as clear as one might first think. "git re
Simon Oosthoek writes:
> +# __git_ps1_pc accepts 0 arguments (for now)
> +# It is meant to be used as PROMPT_COMMAND, it sets PS1
> +__git_ps1_pc ()
> +{
> + local g="$(__gitdir)"
> + if [ -n "$g" ]; then
> +...
> + fi
> +}
This looks awfully similar to the existing code in __git_ps1
Nguyễn Thái Ngọc Duy writes:
> Notes are shown after commit body. From user perspective it looks
> pretty much like commit body and they may assume --grep would search
> in that part too. Make it so.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> On Fri, Sep 28, 2012 at 1:16 AM, Junio C Hamano
Nguyễn Thái Ngọc Duy writes:
> Similar to --author/--committer which filters commits by author and
> committer header fields. --grep-reflog adds a fake "reflog" header to
> commit and a grep filter to search on that line.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> On Fri, Sep 28, 2012 at 1
Marc Branchaud writes:
> On 12-09-27 11:38 PM, Junio C Hamano wrote:
>>
>> * mb/remote-default-nn-origin (2012-07-11) 6 commits
>> - Teach get_default_remote to respect remote.default.
>> - Test that plain "git fetch" uses remote.default when on a detached HEAD.
>> - Teach clone to set remo
Hi Ben,
I am running git gui on Windows 7. Are you running it on Linux?
-Angelo
--
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
On Fri, Sep 28, 2012 at 05:08:52PM +0200, SZEDER Gábor wrote:
> On Fri, Sep 28, 2012 at 12:09:35PM +0200, SZEDER Gábor wrote:
> > __gitcomp_nl ()
> > {
> > local IFS=$'\n'
> > - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> > + COMPREPLY=($(echo "$1" |sed -n "/^$
Hi there!
My team is helping to spread the word about a really great resource page your
customers and/or readers would probably appreciate called:
43 Free Cloud Services for Application Developers
http://xeround.com/blog/2012/08/43-free-cloud-resources-for-application-developers
When searching
On Fri, Sep 28, 2012 at 12:09:35PM +0200, SZEDER Gábor wrote:
> __gitcomp_nl ()
> {
> local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> + COMPREPLY=($(echo "$1" |sed -n "/^${3-$cur}/ {
$cur can be a path, so it can contain /, which then brea
Hi Angelo,
On Fri, Sep 28, 2012 at 2:09 PM, Angelo Borsotti
wrote:
> I have removed the Italian localization so as to make git gui use the
> English one.
> The result is the same as I have found before.
> The message is: " Not a Git repository: remote.git".
> Thus, the misleading message is there
On 12-09-27 11:38 PM, Junio C Hamano wrote:
* mb/remote-default-nn-origin (2012-07-11) 6 commits
- Teach get_default_remote to respect remote.default.
- Test that plain "git fetch" uses remote.default when on a detached HEAD.
- Teach clone to set remote.default.
- Teach "git remote" abou
Make the intent of "--bool" more obvious by returning a direct True
or False value. Convert a couple non-bool users with obvious bool
intent.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 45 ++---
1 file changed, 26 insertions(+), 19 deletions(-)
diff --g
Signed-off-by: Pete Wyckoff
---
git-p4.py | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index c0c738a..007ef6b 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -514,13 +514,16 @@ def gitBranchExists(branch):
return proc.wait() == 0;
_g
Signed-off-by: Pete Wyckoff
---
git-p4.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 9c33af4..c0c738a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -525,7 +525,8 @@ def gitConfig(key, args = None): # set args to "--bool",
for instance
def gi
Invoke git rev-list directly, avoiding the shell, in
P4Submit and P4Sync. The overhead of starting extra
processes is significant in cygwin; this speeds things
up on that platform.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a
The extra quoting and double-% are unneeded, just to work
around the shell. Instead, avoid the shell indirection.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index a6806bc..a92d84f 100755
--- a/git-p4.py
+
On windows, p4 marks un-edited files as read-only. Not only are
they read-only, but also they cannot be deleted. Remove the
read-only attribute before deleting in both the copy and rename
cases.
This also happens in the RCS cleanup code, where a file is marked
to be deleted, but must first be ed
It does not notice chmod +x or -x; there is nothing
for this test to do.
Signed-off-by: Pete Wyckoff
---
t/t9815-git-p4-submit-fail.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index d2b7b3d..2db1bf1 10075
I have removed the Italian localization so as to make git gui use the
English one.
The result is the same as I have found before.
The message is: " Not a Git repository: remote.git".
Thus, the misleading message is there.
-Angelo
--
To unsubscribe from this list: send the line "unsubscribe git" in
There are some old version of p4, compiled for cygwin, that
treat read-only files differently.
Normally, a file that is not open is read-only, meaning that
"test -w" on the file is false. This works on unix, and it works
on windows using the NT version of p4. The cygwin version
of p4, though, ch
This character is not valid in windows filenames, even though
it can appear in p4 depot paths. Avoid using it in tests on
windows, both mingw and cygwin.
Signed-off-by: Pete Wyckoff
---
t/t9809-git-p4-client-view.sh | 10 --
t/t9812-git-p4-wildcards.sh | 37 +++
In all clients, even those created on windows, use unix line
endings. This makes it possible to verify file contents without
doing OS-specific comparisons in all the tests.
Tests in t9802-git-p4-filetype.sh are used to make sure that
the other LineEnd options continue to work.
Signed-off-by: Pet
P4 stores newlines in the depos as \n. By default, git does this
too, both on unix and windows. Test to make sure that this stays
true.
Both git and p4 have mechanisms to use \r\n in the working
directory. Exercise these.
Signed-off-by: Pete Wyckoff
---
t/t9802-git-p4-filetype.sh | 117 +
Files of type utf16 are handled with "p4 print" instead of the
normal "p4 -G print" interface due to how the latter does not
produce correct output. See 55aa571 (git-p4: handle utf16
filetype properly, 2011-09-17) for details.
On windows, though, "p4 print" can not be told which line
endings to u
Replacing \r\n with \n on windows was added in c1f9197 (Replace
\r\n with \n when importing from p4 on Windows, 2007-05-24), to
work around an oddity with "p4 print" on windows. Text files
are printed with "\r\r\n" endings, regardless of whether they
were created on unix or windows, and regardless
Native windows binaries do not understand posix-like
path mapping offered by cygwin. Convert paths to native
using "cygpath --windows" before presenting them to p4d.
This is done using the AltRoots mechanism of p4. Both the
posix and windows forms are put in the client specification,
allowing p4
This will avoid having to do native path conversion for
windows. Also may be a bit cleaner always to know that p4d
has that working directory, instead of wherever the function
was called from.
Signed-off-by: Pete Wyckoff
---
t/lib-git-p4.sh | 7 +--
1 file changed, 5 insertions(+), 2 deleti
Use the standard client_view function from lib-git-p4.sh
instead of building one by hand. This requires a bit of
rework, using the current value of $P4CLIENT for the client
name. It also reorganizes the test to isolate changes to
$P4CLIENT and $cli in a subshell.
Signed-off-by: Pete Wyckoff
---
Simplify the code a bit by using an existing function.
Signed-off-by: Pete Wyckoff
---
t/lib-git-p4.sh | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 7061dce..890ee60 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -7
The output was a bit nonsensical, including a bare %d. Fix it
to make it easier to understand.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index eef5c94..d7ee4b4 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -
Depot paths must start with //. Exit with a better explanation
when a bad depot path is supplied.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 1 +
t/t9800-git-p4-basic.sh | 5 +
2 files changed, 6 insertions(+)
diff --git a/git-p4.py b/git-p4.py
index 97699ef..eef5c94 100755
Found by "pyflakes" checker tool.
Modules shelve, getopt were unused.
Module os.path is exported by os.
Reformat one-per-line as is PEP008 suggested style.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/git-p4.py b/gi
Commit fed2369 (git-p4: Search for parent commit on branch creation,
2012-01-25) uses temporary branches to help find the parent of a
new p4 branch. The temp branches are of the form "git-p4-tmp/%d"
for some p4 change number. Mistakenly, this string was made
using os.path.join() instead of just s
This series fixes problems in git-p4, and its tests, so that
git-p4 works on the cygwin platform.
See the wiki for info on how to get started on cygwin:
https://git.wiki.kernel.org/index.php/GitP4
Testing by people who use cygwin would be appreciated. It would
be good to support cygwin more
On Thu, Sep 27, 2012 at 7:47 AM, Shawn Pearce wrote:
> * https://git.eclipse.org/r/7939
>
> Defines the new E003 index format and the bit set
> implementation logic.
Quote from the patch's message:
"Currently, the new index format can only be used with pack files that
contain a complete clos
Hi again
After the previous comments, I decided to attempt it using
PROMPT_COMMAND rather than calling a function from command substitution
in PS1. This new code works and doesn't have the wrapping issue anymore.
I've simplified some of the coloring stuff and for now there's no
parameters to c
On Fri, Sep 28, 2012 at 2:58 PM, Jon Seymour wrote:
> G'day
>
> An svn developer created a branch from a subdirectory of the trunk
> rather than by copying trunk itself.
>
> I want to avoid pulling this branch into my git repo with git svn
> fetch because the re-rooting pulls in too much history a
compgen performs expansion on all words in the list given to its -W
option. This breaks completion in various ways if one of those words
can be expanded, as demonstrated by failing tests added in a previous
commit.
In __gitcomp_nl() we use only a small subset of compgen's
functionality: to filter
compgen performs expansion on all words in the list given to its -W
option. This breaks completion in various ways if one of those words
can be expanded. The funniest breakage is probably this, as the
command_not_found_handle kicks in:
$ git branch '$(foo)'
$ git branch No command 'foo' found, d
To simulate the the user hit 'git , one of the completion tests
sets up the rather strange command line
git ""
i.e. the second word on the command line consists of two double
quotes. However, this is not what happens for real, because after
'git ' the second word on the command line is just an
Test __gitcomp_nl()'s basic functionality, i.e. that trailing space,
prefix, and suffix are added correctly.
Signed-off-by: SZEDER Gábor
---
t/t9902-completion.sh | 47 +++
1 file changed, 47 insertions(+)
diff --git a/t/t9902-completion.sh b/t/t9902-
When invoking __gitcomp() the $cur variable should hold the word to be
completed, but two tests (checking the handling of prefix and suffix)
set it to a bogus value.
Luckily the bogus values haven't influenced the tests' correctness,
because these two tests pass the word-to-be-matched as argument
On Thu, Sep 27, 2012 at 02:43:38AM -0400, Jeff King wrote:
> Here are the numbers using sed[1]
> instead:
> -# Quotes each element of an IFS-delimited list for shell reuse
> +# Quotes each element of a newline-delimited list for shell reuse
> __git_quote()
> {
> - local i
> - local deli
Am 28.09.2012 10:35, schrieb Frans Klaver:
> Hi,
>
> Please remember to reply to all when discussing things on the git mailing
> list.
>
> On Fri, Sep 28, 2012 at 10:29 AM, Angelo Borsotti
> wrote:
>> Hello
>>
>> I apologise for having used the wrong script to reproduce the error.
>> This is t
Hi,
Please remember to reply to all when discussing things on the git mailing list.
On Fri, Sep 28, 2012 at 10:29 AM, Angelo Borsotti
wrote:
> Hello
>
> I apologise for having used the wrong script to reproduce the error.
> This is the right one:
>
> angelo@ANGELO-PC /d/gtest (master)
> $ mkdir
On Fri, Sep 28, 2012 at 9:50 AM, Angelo Borsotti
wrote:
> I have created a bare repository:
>
> $ mkdir remote.git
>
> angelo@ANGELO-PC /d/gtest (master)
> $ git init --bare
> Initialized empty Git repository in d:/gtest/
This creates a bare repository in d:/gtest, not in
d:/gtest/remote.git. Yo
Notes are shown after commit body. From user perspective it looks
pretty much like commit body and they may assume --grep would search
in that part too. Make it so.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
On Fri, Sep 28, 2012 at 1:16 AM, Junio C Hamano
wrote:
> The output from "log --show-not
Similar to --author/--committer which filters commits by author and
committer header fields. --grep-reflog adds a fake "reflog" header to
commit and a grep filter to search on that line.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
On Fri, Sep 28, 2012 at 12:09 AM, Junio C Hamano
wrote:
> I am deb
Signed-off-by: Nguyễn Thái Ngọc Duy
---
On Fri, Sep 28, 2012 at 12:09 AM, Junio C Hamano wrote:
>> enum grep_header_field {
>> GREP_HEADER_AUTHOR = 0,
>> - GREP_HEADER_COMMITTER
>> + GREP_HEADER_COMMITTER,
>> + GREP_HEADER_REFLOG,
>> + GREP_HEADER_FIELD_MAX
>> };
99 matches
Mail list logo
