On 03/09/2015 04:20 AM, Eric Sunshine wrote:
On Thu, Mar 5, 2015 at 1:19 PM, Karthik Nayak karthik@gmail.com wrote:
made changes to cat-file to include a --literally
Write in imperative mood: Teach cat-file a --literally option...
option which prints the type of the object without any
On 03/09/2015 12:39 AM, Junio C Hamano wrote:
karthik nayak karthik@gmail.com writes:
Sorry for the confusion, you did already say that in $gmane/264955 , I'm
talking about how I tackled the issue in $gmane/264855.
Well, I am suggesting how to improve what you did in your
$gmane/264855
The first one attempts to fix git status reporting intent-to-add
files as changes to be committed. The new file report is now moved
to git diff-files aka changes not staged for commit instead.
I just want to check if I'm going on the right direction as core diff
machinery is not really my area. I
Paul Tan pyoka...@gmail.com writes:
diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh
index f61b40c..7fe832d 100755
--- a/t/t0302-credential-store.sh
+++ b/t/t0302-credential-store.sh
@@ -5,5 +5,97 @@ test_description='credential-store tests'
.
On Sun, Mar 08, 2015 at 05:58:24PM -0400, Eric Sunshine wrote:
On Sun, Mar 8, 2015 at 11:03 AM, Kevin Daudt m...@ikke.info wrote:
rev-list --bisect is used by git bisect, but never together with
--first-parent. Because rev-list --bisect together with --first-parent
is not handled currently,
On 03/09/2015 03:55 AM, Eric Sunshine wrote:
On Thu, Mar 5, 2015 at 1:18 PM, Karthik Nayak karthik@gmail.com wrote:
cache: modify for cat-file --literally -t
It is desirable for the first line of the commit message to explain,
as well as possible, the intent of the patch. The bulk of
Christian Couder venit, vidit, dixit 07.03.2015 08:18:
Hi,
On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote:
At some point of time I think it may be worth reevaluating the toxic
atmosphere against freelancers doing Git development.
My opinion on this is that the Git
Paths marked by git add -N are simply a reminder to the user that
these files should be staged. If the user does not stage any of them,
git commit will not record them.
Align the behavior of diff --cached and git commit. The most
prominent result of this patch is git status no longer reports
Michael J Gruber g...@drmicha.warpmail.net writes:
Christian Couder venit, vidit, dixit 07.03.2015 08:18:
Hi,
On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote:
At some point of time I think it may be worth reevaluating the toxic
atmosphere against freelancers doing Git
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/add.c | 1 +
diff-lib.c| 5 +
2 files changed, 6 insertions(+)
diff --git a/builtin/add.c b/builtin/add.c
index 3390933..ee370b0 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -63,6 +63,7 @@ static void
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
For the record, the tests would need to change like this, and it makes
a lot of sense. After the change, i-t-a is not a change staged in
the index any more - and in fact in never was, as git commit shows.
t/t2203-add-intent.sh | 7
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Since we're talking business: git-scm.com still looks a bit like a
ProGit/Github promotion site. I don't have anything against either, and
git-scm.com provides a lot of the information that users are looking
From: Stefan Beller sbel...@google.com
Sent: Monday, March 02, 2015 3:29 AM
bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
--
The part that the author misses is not all the nice (or not so) stuff
about having a copy of the full repository locally, for all the reasons
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
Shawn Pearce spea...@spearce.org writes:
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Since we're talking business: git-scm.com still looks a bit like a
ProGit/Github promotion site. I
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/help.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin/help.c
index 6133fe4..a1f5a0a 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -456,7 +456,7 @@ static void
Hey,
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Since we're talking business: git-scm.com still looks a bit like a
ProGit/Github promotion site. I don't have anything against either,
Scott Chacon scha...@gmail.com writes:
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
Personally, I consider the recent migration of the Emacs repository to
Git a bigger endorsement but then that's me.
I would love to have Emacs on that page, actually. If you guys want me
Signed-off-by: Stefan Beller sbel...@google.com
---
connect.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/connect.c b/connect.c
index ce0e121..6090211 100644
--- a/connect.c
+++ b/connect.c
@@ -739,6 +739,7 @@ struct child_process *git_connect(int fd[2], const char
*url,
The continue statements nearby also have an accompanying free(ref);
Signed-off-by: Stefan Beller sbel...@google.com
---
bundle.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/bundle.c b/bundle.c
index 2e2dbd5..534783d 100644
--- a/bundle.c
+++ b/bundle.c
@@ -342,6 +342,7 @@ static int
Add regexp based on the Shell Command Language specifications.
Because of the lax syntax of sh, some corner cases may not be
handled properly.
Signed-off-by: Adrien Schildknecht adrien+...@schischi.me
---
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 1 +
Shawn Pearce spea...@spearce.org writes:
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
Shawn Pearce spea...@spearce.org writes:
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Since we're talking business: git-scm.com still looks a bit
Hi,
I'm a french student from EPITA and I plan to apply for the GSoC.
Adrien Schildknecht (1):
userdiff: funcname and word patterns for sh
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 1 +
t/t4018/sh-function | 4
t/t4018/sh-function-comment
Hey,
On Mon, Mar 9, 2015 at 10:12 AM, Christian Couder
christian.cou...@gmail.com wrote:
A few other points about git-scm.com:
* as Michael says it still looks a bit like a ProGit/Github promotion site
* some of the pull request can be rejected even if the developers want
them, like this
On Mon, Mar 9, 2015 at 5:37 PM, David Kastrup d...@gnu.org wrote:
Shawn Pearce spea...@spearce.org writes:
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
Shawn Pearce spea...@spearce.org writes:
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
g...@drmicha.warpmail.net
On Mon, Mar 9, 2015 at 10:49 AM, David Kastrup d...@gnu.org wrote:
since many people coming to the page are doing research to figure out
if they want to switch to it in their companies. It also demonstrates
that these large companies are participating in the open source
community
Uh no, it
David Kastrup d...@gnu.org writes:
Scott Chacon scha...@gmail.com writes:
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote:
Personally, I consider the recent migration of the Emacs repository to
Git a bigger endorsement but then that's me.
I would love to have Emacs on that
Hi,
David Kastrup wrote:
Jeff King p...@peff.net writes:
If people don't like git-scm.com and want to have an alternate site,
I think that's the basic problem here.
With all due respect:
I don't actually see a major problem here. Any serious problems with
the site can be fixed by people
Please give feedback and suggest things I may have missed out on.
I hope I have incorporated all the suggestions.
Signed-off-by: Sundararajan R dyou...@gmail.com
Thanks-to: Junio C Hamano
---
I have attempted to resolve the ambiguity when there exists a file named -
by communicating to the user
rev-list --bisect is used by git bisect, but never together with
--first-parent. Because rev-list --bisect together with --first-parent
is not handled currently, and even leads to segfaults, refuse to use
both options together.
Suggested-by: Junio C. Hamano gits...@pobox.com
Helped-by: Eric
As you had suggested @Junio, I have added the required tests.
Please let me know if there is something is I should add.
Signed-off-by: Sundararajan R dyou...@gmail.com
Thanks-to: Junio C Hamano
---
I have added 6 tests to check for the following cases:
git reset - with no @{-1}
git reset - with
Hi there,
I am taking an online data science course for which I am required to download
Git.
When I go to the Git's site, I can only download Git 2.2.1 Maverick. Also, when
I check in my CLI, it says git version 1.9.3 (Apple Git-50).
I need to download a version of Git that is compatible
On Mon, Mar 9, 2015 at 10:26 PM, Siamak Nooraei siamakn...@gmail.com wrote:
Hi there,
I am taking an online data science course for which I am required to
download Git.
When I go to the Git's site, I can only download Git 2.2.1 Maverick. Also,
when I check in my CLI, it says git version
From: David Kastrup d...@gnu.org
Michael J Gruber g...@drmicha.warpmail.net writes:
Christian Couder venit, vidit, dixit 07.03.2015 08:18:
Hi,
On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote:
At some point of time I think it may be worth reevaluating the
toxic
atmosphere
Jeff King p...@peff.net writes:
If people don't like git-scm.com and want to have an alternate site,
I think that's the basic problem here. As long as people want to _have_
an alternate site rather than want to _write_ and _maintain_ an
alternate site, any site will only be as representative
Adrien Schildknecht adrien+...@schischi.me writes:
+ ^([ \t]*(function[ \t]*)?[a-zA-Z_][a-zA-Z0-9_]*[ \t]*\\([ \t]*\\).*)$,
I guess this should be 'function[ \t]+' (+, not *).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git
On 2015-03-09 17.58, Stefan Beller wrote:
Signed-off-by: Stefan Beller sbel...@google.com
---
connect.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/connect.c b/connect.c
index ce0e121..6090211 100644
--- a/connect.c
+++ b/connect.c
@@ -739,6 +739,7 @@ struct child_process
On Mon, Mar 09, 2015 at 10:52:34AM -0700, Scott Chacon wrote:
* some of the pull request can be rejected even if the developers want
them, like this pull request to add back a list of contributors was:
https://github.com/git/git-scm.com/pull/216
(By the way this pull request talks
Depending on how gpg was built, it may issue the following
message to stderr when run:
Warning: using insecure memory!
When the test is collecting gpg output it is therefore not
enough to just match on a gpg: prefix it must also match
on a Warning: prefix wherever it needs to match lines
Use the standard function isxdigit() to make the intent clearer and
avoid using magic constants.
Signed-off-by: Rene Scharfe l@web.de
---
sha1_name.c | 2 +-
transport.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 95f9f8f..6d10f05
On Mon, Mar 9, 2015 at 2:49 AM, Jeff King p...@peff.net wrote:
$ git init
$ seq 1 1000 file git add file git commit -m base
$ mv file other
$ echo foo file
$ git add .
$ git status --short
M file
C file - other
Fantastic, I am able to replicate with these steps and
Add regexp based on the Shell Command Language specifications.
Because of the lax syntax of sh, some corner cases may not be
handled properly.
Signed-off-by: Adrien Schildknecht adrien+...@schischi.me
---
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 1 +
On Mon, Mar 9, 2015 at 1:00 AM, James purplei...@gmail.com wrote:
This is a patch to add a much needed option to the bash completion
script. I'm not subscribed to this list, so please include me in your
reply if you'd like me to see your response.
Please read the guide on how to submit patches
On 03/09/2015 09:46 PM, Sundararajan R wrote:
As you had suggested @Junio, I have added the required tests.
Please let me know if there is something is I should add.
Signed-off-by: Sundararajan R dyou...@gmail.com
Thanks-to: Junio C Hamano
---
I have added 6 tests to check for the following
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
Note that now a checked branch is listed twice, once as target of the
HEAD, once as branch: They are two different refs and
Sudhanshu Shekhar sudshekha...@gmail.com writes:
- now means the previous branch.
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy
---
These look unusual for a few reasons: your S-o-b should be at the
end, we usually say
Thanks Peff,
I've done an strace and here's what I see. I'll try to put relevant
information in as legible a form as possible. The operation is
cpu-bound on a single core (note that yes, delta compression is using
8 threads. so that's obviously not the bottleneck) for the duration of
the
Jeff King p...@peff.net writes:
However, that is _not_ what we currently do with run-command's
use_shell directive. There we put SHELL_PATH as argv[0], and run:
execv(argv[0], argv);
...
If we want to maintain consistency with the rest of our uses of
run-command, it would be just your
A minor point on capability negotiation. I remember why I passed
capabilities via command line instead of this proposal. With this
proposal, daemon.c does not recognize i18n capability and cannot
switch to the correct language before it reports an error.
But perhaps I approached it the wrong way.
We used a merge driver to create a conflict semaphore file whenever a merge
conflict occurs in Atlassian Stash. This worked for several month until we got
to update our Git version because of another problem.
If I understand it correctly, a merge driver is executed before the normal
internal
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
git status and git branch let the user know when the HEAD is
detached, as well as the current branch, while git log --decorate does not.
Change the decoration by a non-detached HEAD
1) Confirm error message when git reset is used with no previous branch
2) Confirm git reset - works like git reset @{-1}
3) Confirm - is always treated as a commit unless the -- file option
is specified
Signed-off-by: Sudhanshu Shekharsudshekha...@gmail.com
Thanks-to: David
- now means the previous branch.
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy
---
builtin/reset.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 4c08ddc..02f33ef
On Thu, Mar 05, 2015 at 04:03:07PM -0500, Stephen Morton wrote:
I'm experiencing very slow git pushes. On the order of 1 minute to push a
trivial one-line change. When I set GIT_TRACE=1, I see that it seems to be
taking a lot of time in the pack-objects phase.
Can you tell what pack-objects
On Thu, Mar 05, 2015 at 04:20:10PM +0100, Aschemann Gerd wrote:
seems to be a bug: If adding a submodule from an https URL with a certificate
issued by StartSSL (or even a private/self-signed one?) leads to the
following error:
$ git -c http.sslverify=false submodule add
On Sun, Mar 08, 2015 at 11:32:22PM -0700, Kyle J. McKay wrote:
It is a common convention to make the first argument the command
name without its path, and this change breaks that convention.
Hmpf. I present these for your consideration:
$ sh -c 'echo $0'
sh
$ /bin/sh -c 'echo $0'
On Sun, Mar 08, 2015 at 09:41:08PM -0400, Matthew Rothenberg wrote:
I see, thank you. But how would one ever get a copy operation to show
up in the output of `git status -z` to begin with? It appears copies
are only detected in `diff` and `show`, can be forced with the
--find-copies-harder
On Fri, Mar 06, 2015 at 09:12:45PM -0800, Kyle J. McKay wrote:
And I responded and that response and the rest of the thread are available
on gmane [1], but the first two messages are not. I waited 10 days just to
make sure there were no bounce emails or undeliverable notifications coming
On Mar 7, 2015, at 23:52, Junio C Hamano wrote:
Kyle J. McKay mack...@gmail.com writes:
If the user has set SHELL_PATH in the Makefile then we
should respect that value and use it.
Signed-off-by: Kyle J. McKay mack...@gmail.com
---
builtin/help.c | 2 +-
1 file changed, 1 insertion(+), 1
On Mon, Mar 09, 2015 at 02:19:20AM -0400, Jeff King wrote:
We don't turn on copy-detection in git status by default (only rename
detection), and I think you are right that there is currently no way to
turn it on manually.
Actually, I take it back. We do break-detection in git-status, which
On Sun, Mar 08, 2015 at 10:19:20PM -0700, Kyle J. McKay wrote:
I am not convinced this isn't a violation of POSIX (which specifies that
field splitting is done on the results of parameter expansions outside
of double-quotes). But whether it is or not, we have to live with it.
That's not the
On 08/03/15 11:06, Junio C Hamano wrote:
Anton Trunov anton.a.tru...@gmail.com writes:
On 04/03/15 23:01, Junio C Hamano wrote:
My apologies for pushing this topic, but what would you recommend?
Should we treat both sides line-wise or should we correct the documentation?
My gut feeling
On Tue, Feb 24, 2015 at 2:00 AM, Junio C Hamano gits...@pobox.com wrote:
Michael J Gruber g...@drmicha.warpmail.net writes:
status, status -s and the like are in an ordinary user's tool box.
ls-files isn't, at least not with -t, which we even mark as deprecated.
That makes me wonder, though,
The index does not store directories explicitly (except submodules) so
we have to figure them out from file list when output lis depth-limited.
The function add_directory() can generate duplicate entries, which is
cleaned up before displaying.
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 95a2e19..9a55ea6 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -10,6 +10,7
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index b99f2b7..c444a53 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -3,6 +3,7 @@
list-files is supposed to be the user friendly version of ls-files, or
an alternative to git-status. Nothing fancy in this patch yet.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
.gitignore | 1 +
Makefile | 1 +
builtin.h | 1 +
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 16
1 file changed, 16 insertions(+)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 18af65c..95a2e19 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -4,10 +4,12 @@
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index ac33f13..b99f2b7 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -65,6 +65,8 @@ int
Gondek, Andreas venit, vidit, dixit 09.03.2015 10:02:
We used a merge driver to create a conflict semaphore file whenever a
merge conflict occurs in Atlassian Stash. This worked for several
month until we got to update our Git version because of another
problem.
That is the first issue: Can
Kyle J. McKay venit, vidit, dixit 09.03.2015 06:32:
On Mar 8, 2015, at 18:22, brian m. carlson wrote:
On Sun, Mar 08, 2015 at 06:15:55PM -0400, Eric Sunshine wrote:
On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
Perhaps this is better?
Unfortunately
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 71
1 file changed, 66 insertions(+), 5 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index a82410d..74836f6 100644
---
If no filter options are specified, --cached is the default.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 62
1 file changed, 62 insertions(+)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
config.c | 8
1 file changed, 8 insertions(+)
diff --git a/config.c b/config.c
index 15a2983..16209c6 100644
--- a/config.c
+++ b/config.c
@@ -40,6 +40,10 @@ static struct config_source *cf;
static int zlib_compression_seen;
When both --cached and one of -amdAMD is used together we may have two
entries of the same path, e.g. foo and MM foo. In this case it's
pretty clear that foo must be tracked, no need to displayfoo.
The new function does that.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 93364b9..fbacad9 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
All entry strings start with two-letter tag and a space. If all
entries have the same tags, tags are not displayed.
The outcome before and after this patch is the same. But it will be
useful in future when there are more than one type of entry.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 97fa8bf..eb51e7a 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -51,6 +51,8 @@ static void
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 24
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index dc865a1..316f59c 100644
--- a/builtin/list-files.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/list-files.c | 47 +++
1 file changed, 43 insertions(+), 4 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index fbacad9..a82410d 100644
--- a/builtin/list-files.c
This appends an indicator after the file name if it's executable, a
directory and so on, like in GNU ls. In fact append_indicator() is a
rewrite from get_type_indicator() in coreutils.git commit
7326d1f1a67edf21947ae98194f98c38b6e9e527.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
80 matches
Mail list logo
