Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
On Fri, Sep 28, 2012 at 12:09 AM, Junio C Hamano gits...@pobox.com wrote:
enum grep_header_field {
GREP_HEADER_AUTHOR = 0,
- GREP_HEADER_COMMITTER
+ GREP_HEADER_COMMITTER,
+ GREP_HEADER_REFLOG,
+
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 pclo...@gmail.com
---
On Fri, Sep 28, 2012 at 12:09 AM, Junio C Hamano
On Fri, Sep 28, 2012 at 9:50 AM, Angelo Borsotti
angelo.borso...@gmail.com 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
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
angelo.borso...@gmail.com wrote:
Hello
I apologise for having used the wrong script to reproduce the error.
This is the right one:
angelo@ANGELO-PC
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
angelo.borso...@gmail.com wrote:
Hello
I apologise for having used the wrong script to reproduce the error.
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
Test __gitcomp_nl()'s basic functionality, i.e. that trailing space,
prefix, and suffix are added correctly.
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
t/t9902-completion.sh | 47 +++
1 file changed, 47 insertions(+)
diff --git
To simulate the the user hit 'git TAB, 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 TAB' the second word on the command line is
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 TABNo command 'foo'
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
On Fri, Sep 28, 2012 at 2:58 PM, Jon Seymour jon.seym...@gmail.com 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
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
On Thu, Sep 27, 2012 at 7:47 AM, Shawn Pearce spea...@spearce.org 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
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
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
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 p...@padd.com
---
git-p4.py | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git
Depot paths must start with //. Exit with a better explanation
when a bad depot path is supplied.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
The output was a bit nonsensical, including a bare %d. Fix it
to make it easier to understand.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
+++
Simplify the code a bit by using an existing function.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
+++
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
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 p...@padd.com
---
t/lib-git-p4.sh | 7 +--
1 file changed, 5
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
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 of
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 use,
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 p...@padd.com
---
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:
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 p...@padd.com
---
t/t9809-git-p4-client-view.sh | 10 --
t/t9812-git-p4-wildcards.sh | 37
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,
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
It does not notice chmod +x or -x; there is nothing
for this test to do.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
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
The extra quoting and double-% are unneeded, just to work
around the shell. Instead, avoid the shell indirection.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
---
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 p...@padd.com
---
git-p4.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
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 p...@padd.com
---
git-p4.py | 45 ++---
1 file changed, 26 insertions(+), 19
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 about
Hi Angelo,
On Fri, Sep 28, 2012 at 2:09 PM, Angelo Borsotti
angelo.borso...@gmail.com 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
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 breaks this sed
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
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
Marc Branchaud marcn...@xiplink.com 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
Nguyễn Thái Ngọc Duy pclo...@gmail.com 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 pclo...@gmail.com
---
On Fri, Sep 28,
Simon Oosthoek soosth...@nieuwland.nl 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
On Thu, Sep 27, 2012 at 5:20 AM, Chris Webb ch...@arachsys.com 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
SZEDER Gábor sze...@ira.uka.de writes:
To simulate the the user hit 'git TAB, 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
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
On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
SZEDER Gábor sze...@ira.uka.de writes:
To simulate the the user hit 'git TAB, 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
Pete Wyckoff p...@padd.com 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
Pete Wyckoff p...@padd.com writes:
Simplify the code a bit by using an existing function.
Signed-off-by: Pete Wyckoff p...@padd.com
---
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
Pete Wyckoff p...@padd.com writes:
The output was a bit nonsensical, including a bare %d. Fix it
to make it easier to understand.
Signed-off-by: Pete Wyckoff p...@padd.com
---
git-p4.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index
SZEDER Gábor sze...@ira.uka.de writes:
On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
SZEDER Gábor sze...@ira.uka.de writes:
To simulate the the user hit 'git TAB, one of the completion tests
s/the the/that the/
sets up the rather strange command line
git
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 p...@padd.com
---
t/t9815-git-p4-submit-fail.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
Jeff King p...@peff.net 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
test_cmp
On Fri, Sep 28, 2012 at 12:23:47PM -0700, Junio C Hamano wrote:
SZEDER Gábor sze...@ira.uka.de writes:
On Fri, Sep 28, 2012 at 11:04:05AM -0700, Junio C Hamano wrote:
SZEDER Gábor sze...@ira.uka.de writes:
To simulate the the user hit 'git TAB, one of the completion tests
s/the
Jeff King p...@peff.net 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
---
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 yet)
Jeff King p...@peff.net writes:
+proc refresh_index {} {
+global need_index_refresh
+if { $need_index_refresh } {
+ exec sh -c git update-index --refresh /dev/null 21 || true
I think the usual idiom for ignoring errors is to use catch around exec,
avoiding the extra shell
On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
Jeff King p...@peff.net writes:
+proc refresh_index {} {
+global need_index_refresh
+if { $need_index_refresh } {
+ exec sh -c git update-index --refresh /dev/null 21 || true
I think the usual idiom for
Jeff King p...@peff.net writes:
On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
Jeff King p...@peff.net writes:
+proc refresh_index {} {
+global need_index_refresh
+if { $need_index_refresh } {
+ exec sh -c git update-index --refresh /dev/null 21 || true
I
On Fri, Sep 28, 2012 at 04:02:32PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
+proc refresh_index {} {
+global need_index_refresh
+if { $need_index_refresh } {
+exec sh -c git update-index --refresh /dev/null 21 || true
I think the usual
Jeff King p...@peff.net 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
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote:
Jeff King p...@peff.net writes:
+proc refresh_index {} {
+global need_index_refresh
+if { $need_index_refresh } {
+ exec sh -c git
On Sat, Sep 29, 2012 at 12:55 AM, Junio C Hamano gits...@pobox.com 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
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
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 pclo...@gmail.com
---
revision.c | 6 ++
1 file changed, 6 insertions(+)
diff --git
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
On 09/27/2012 11:27 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
@@ -54,20 +73,36 @@ const char *real_path(const char *path)
}
if (*buf) {
-if (!*cwd !getcwd(cwd, sizeof(cwd)))
-
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/28/2012 12:48 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu 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,
Michael Haggerty mhag...@alum.mit.edu 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
Michael Haggerty mhag...@alum.mit.edu writes:
On 09/28/2012 12:48 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
- for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
- for (colon = ceil; *colon *colon != PATH_SEP; colon++);
- len =
On 09/28/2012 12:51 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu 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
Jeff King p...@peff.net 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)
+retval =
74 matches
Mail list logo
