On Monday, March 9, 2015, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
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
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Documentation/config.txt | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 69a7345..fe8705d 100644
--- a/Documentation/config.txt
+++
On Mon, Mar 9, 2015 at 2:57 PM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
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
On 03/05/2015 08:19 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
One likely reason for fdopen() to fail is the lack of memory for
allocating a FILE structure. When that happens, try freeing some
memory and calling fdopen() again in the hope that it will work the
On 03/06/2015 06:08 AM, Torsten Bögershausen wrote:
On 03/05/2015 05:07 PM, Michael Haggerty wrote:
One likely reason for fdopen() to fail is the lack of memory for
allocating a FILE structure. When that happens, try freeing some
memory and calling fdopen() again in the hope that it will work
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
.. while I'm looking at config.txt. I think this is the preferred naming
convention for config keys. I may have missed some in this file but
this is better than before already.
Documentation/config.txt | 220
Added the following test cases:
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
4) Confirm git reset - works normally even
'git reset -' will reset to the previous branch. It will behave similar
to @{-1} except when a file named '@{-1}' is present. To refer to a file
named '-', use ./- or the -- flag.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy
Dear Authors,
We would like to invite you to organize a Special Session or a Workshop
in CSCC 2015: Circuits, Systems, Communications and Computers
www.cscc.co in conjuction with several parallel conferences of INASE.org
We would like to invite you also to present an Invited Lecture (you know
Junio C Hamano venit, vidit, dixit 10.03.2015 03:03:
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
From: Junio C Hamano gits...@pobox.com
Currently, log decorations do not indicate which branch is checked out
and whether HEAD is detached.
When branch foo is checked out, change the HEAD, foo part of the
decorations to HEAD - foo. This serves to indicate both ref
decorations (helped by the
Except for the separator, all output items reset the color immediately.
Do the same for the separator.
This affects only cases where setting color A does not override color B,
such as when one is forground and one background.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
So it didn't take too long to convince me after all :)
Here comes Junio's version, preceded by a cleanup of the color
setting and resetting for decorations.
Junio C Hamano (1):
log: decorate HEAD with branch name
Michael J Gruber (1):
log-tree: properly reset colors
log-tree.c
On Sun, Mar 8, 2015 at 3:58 PM, Paul Tan pyoka...@gmail.com wrote:
remove_credential(fns, c);
else if (!strcmp(op, store))
- store_credential(fns, c, fns.nr - 1);
+ store_credential(fns, c, 0);
else
; /* Ignore
Sudhanshu Shekhar sudshekha...@gmail.com writes:
*rev_ret = rev;
-
if (read_cache() 0)
Please don't make whitespace-only changes like this in your patches.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the
Hi,
I noticed there is a missing slot named unmerged inside the
color.status.slot on the documentation page:
http://git-scm.com/docs/git-config
This color is used when git status command is performed during the
conflict in the rebase process.
M.
--
To unsubscribe from this list: send the line
Sudhanshu Shekhar sudshekha...@gmail.com writes:
+test_expect_success 'reset - while having file named - and no previous
branch' '
I like having the expected behavior in the test name too. e.g. add
fails at the end of the sentence.
+test_expect_success 'reset - in the presence of file named
On Mon, Mar 9, 2015 at 8:36 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Paul Tan pyoka...@gmail.com writes:
+'
+test_expect_success 'xdg credentials file will not be created if it does
not exist' '
We usually put a blank line between tests.
Okay, will do that.
+helper_test store
On 10.03.15 11:39, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
.. while I'm looking at config.txt. I think this is the preferred naming
convention for config keys.
I think the default is unix-like lowercase,
this is what Git itself produces.
Stefan Beller sbel...@google.com writes:
There was one continue statement without an accompanying `free(ref)`.
Instead of adding that, replace all the freecontinue with a goto
just after writing the refs, where we'd do the free anyway and then
reloop.
Signed-off-by: Stefan Beller
Best Way to Play iTunes Movies on Galaxy Tab Pro 12.2
If you want to put your own movies purchased from iTunes store on Samsung
Galaxy Tab Pro 12.2 tablet, you got the right way!
How to convert put iTunes movies/songs onto Galaxy Tab Pro 12.2
Because --graph is about connected history while --no-walk
is about discrete points, it does not make sense to allow
giving these two options at the same time. [1]
This change makes a few calls to show --graph fail in
t4052, but asking to show one commit with graph is a
nonsensical thing to do.
Christian Couder christian.cou...@gmail.com writes:
I don't want to write again about each of these points now. I am more
interested in discussing a good strategy to try to revert the sad
trend of Git developers being promoted less and less, because I think
that it is really very important.
On Tue, Mar 10, 2015 at 11:38 AM, Sundararajan R dyou...@gmail.com wrote:
Teaching reset the - shorthand involves checking if any file named '-' exists
because it then becomes ambiguous as to whether the user wants to reset the
file '-' or if he wants to reset the working tree to the previous
Eric Sunshine sunsh...@sunshineco.com writes:
+test_expect_success 'reset - with no @{-1}' '
+ git init new --quiet
Why --quiet?
Also, to make sure tests serve as good examples, tests should stick
to options first and then arguments, i.e. git init --quiet new,
if it passes options.
--
Eric Sunshine sunsh...@sunshineco.com writes:
@@ -226,7 +233,14 @@ static void parse_args(struct pathspec *pathspec,
rev = *argv++;
} else {
/* Otherwise we treat this as a filename */
-
On Tue, Mar 10, 2015 at 11:38 AM, Sundararajan R dyou...@gmail.com wrote:
reset: add tests for git reset -
Since this patch is changing the tests rather than 'reset' itself,
you'd likely want to say:
t7102: add 'reset -' tests
The failure case which occurs on teaching git is taught the
On 2015-03-10 16.38, Sundararajan R wrote:
Helped-by: Torsten Bögershausen tbo...@web.de
There seems to be an issue that the mail is encoded
from (what ? Latin-1) into UTF-8 2 times
The easy solution is to remove the line,
I'm OK with that, since a review-comment is not necessarily motivating
Hi,
On Tue, Mar 10, 2015 at 6:56 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Sudhanshu Shekhar sudshekha...@gmail.com writes:
+test_expect_success 'reset - while having file named - and no previous
branch' '
I like having the expected behavior in the test name too. e.g. add
fails
On Wed, Mar 11, 2015 at 8:04 AM, Jason St. John jstj...@purdue.edu wrote:
Or if that would make the release notes too cumbersome to review, what
about using systemd's method? systemd's release notes include a
contributions from section at the very end that lists everyone with
a patch included
Hello Everyone,
I am glad to be here and would be even more happier if I am able to do the work
that I have undertaken, that is representation of git using mathematics. Even I
have taken up this as my final year project, currently I am student of Applied
Mathematics. I am doing this because
Stefan Beller sbel...@google.com writes:
Hmph, does this memory belong to us, or are we peeking into the
cached data in the config cache layer?
So alias_lookup(..) is a wrapper around git_config_string essentially
(some more git_config_functions are involved, but we eventually reach
I just released version 2.1 of Tig which brings a lot of improvements to speed
up usage in large repositories such as the Linux kernel repo (see improvements
related to #310, #324, #350, and #368). Else this release brings minor
improvements across the board plus a fair amount of bug fixes. See
We keep seeing reports of Gerrit Code Review users who incorrectly do
something like:
git clone URL foo
cd foo
git commit --amend -m My first change! -a
git push URL HEAD:refs/for/master
Step #3 is where they get into trouble. They just amended the
published tip commit and pushed it back
On Mar 7, 2015, at 15:23, brian m. carlson wrote:
This is a patch series to convert some of the relevant uses of
unsigned
char [20] to struct object_id.
brian m. carlson (10):
All patches applied for me (to master) and all tests pass.
Tested-by: Kyle J. McKay
Define a structure for
Jason St. John jstj...@purdue.edu writes:
In the Git release notes for something like git foo
learned a new option --bar, a simple (Thanks|Kudos) to John Smith
at the end of each bullet point may be a good way to recognize
developers in a concise manner without needing to dig through the
Duy Nguyen pclo...@gmail.com writes:
... We may want to acknowledge review efforts as well, by
grepping Helped-by:, Reviewed-by:...
Agreed. Something along the lines of
$ git shortlog --no-merges -s -n -t Helped-by -t Reviewed-by v2.3.0..
6 4 0 Michael Haggerty
3 0 1
Shawn Pearce spea...@spearce.org writes:
We keep seeing reports of Gerrit Code Review users who incorrectly do
something like:
git clone URL foo
cd foo
git commit --amend -m My first change! -a
git push URL HEAD:refs/for/master
Step #3 is where they get into trouble. They just
On Tue, Mar 10, 2015 at 1:23 PM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder christian.cou...@gmail.com writes:
I don't want to write again about each of these points now. I am more
interested in discussing a good strategy to try to revert the sad
trend of Git developers being
Convert MKV with DTS to AC3 to Chromecast for playback
Here is a step by step guide to convert MKV with DTS-HD Master Audio to AC3
5.1 for playing on Google Chromecast on Windows and Mac.
Question:
/I am trying to play an MKV file which is encoded with DTS on ChromeCast via
DSVideo. DS Video
On 03/10/2015 11:54 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Well, that's true, but the eol attribute can regain its effect if
binary is followed by text or text=auto. So I guess the simplest
question is as follows. Suppose I have the following .gitattributes:
Teaching reset the - shorthand involves checking if any file named '-' exists
because it then becomes ambiguous as to whether the user wants to reset the
file '-' or if he wants to reset the working tree to the previous branch.
check_filename() is used to perform this check. A similar ambiguity
Reported-by: Mladen B. mladen...@gmail.com
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/config.txt | 6 --
contrib/completion/git-completion.bash | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt
JFF stands for just for fun.
This is not meant to give out a model answer and is known to be
incomplete, but I was wondering if it would be a better direction to
allow - as a stand-in for @{-1} everywhere we allow a branch
name, losing workarounds at the surface level we have for checkout,
merge
hi everyone
I have found a solution which may not be the best so I’m asking it here to see
if I get a different solution from the wizards group. :)
I have a number of repos that were converted from svn to git. After the
conversion the branches that contained each release were named something
On Tue, Mar 10, 2015 at 6:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1530255..b4cc577 100644
--- a/Documentation/config.txt
+++
J. R. Westmoreland j...@jrw.org writes:
I have a number of repos that were converted from svn to git. After
the conversion the branches that contained each release were named
something like “branches/version_version-number”. We want to
modify the repo so the branches are named something like
Michael Haggerty mhag...@alum.mit.edu writes:
On 03/06/2015 10:30 PM, Torsten Bögershausen wrote:
Oops, I misunderstood an internal bug report. In seems that it is the
following scenario that is incorrect:
*.png text=auto eol=crlf
Hm, I don't know if we support this combination at
2015-02-23 15:30 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com:
Alex Henrie alexhenri...@gmail.com writes:
This is just a friendly reminder that this patch has been
On Tue, Mar 10, 2015 at 6:52 AM, Sudhanshu Shekhar
sudshekha...@gmail.com wrote:
'git reset -' will reset to the previous branch. It will behave similar
to @{-1} except when a file named '@{-1}' is present. To refer to a file
named '-', use ./- or the -- flag.
Helped-by: Junio C Hamano
Hello Everyone,
I am glad to be here and would be even more
happier if I am able to do the work that I have undertaken, that is
representation of git using mathematics. Even I have taken up this as my final
year project, currently I am student of Applied
On Tue, Mar 10, 2015 at 6:52 AM, Sudhanshu Shekhar
sudshekha...@gmail.com wrote:
Added tests for reset -
Mention the area of the project you are changing, followed by a colon,
followed by a short summary of the change. Drop capitalization. Write
in imperative mood.
t7102: add 'reset -'
On 03/06/2015 10:30 PM, Torsten Bögershausen wrote:
Oops, I misunderstood an internal bug report. In seems that it is the
following scenario that is incorrect:
*.png text=auto eol=crlf
Hm, I don't know if we support this combination at all.
The user can specify this combination in a
On Mar 9, 2015, at 18:38, Duy Nguyen wrote:
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
Michael J Gruber g...@drmicha.warpmail.net writes:
I guess we have at least 3 kinds of people here:
A) Paid to do Git development, at least as part of their job.
B) Freelancers who don't get paid directly for doing git but hope to
profit from their git efforts directly or indirectly.
C)
On Mon, Mar 9, 2015 at 4:46 PM, Sundararajan R dyou...@gmail.com wrote:
Please give feedback and suggest things I may have missed out on.
I hope I have incorporated all the suggestions.
If you haven't already, read Documentation/SubmittingPatches. Pay
particular attention to section #2 which
Hi,
On Tue, Mar 10, 2015 at 8:04 AM, Junio C Hamano gits...@pobox.com wrote:
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
Duy Nguyen pclo...@gmail.com writes:
On Thu, Mar 5, 2015 at 8:28 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
+versionsort.prereleaseSuffix::
+When version sort is used in linkgit:git-tag[1], prerelease
+tags (e.g. 1.0-rc1) may appear after
git reset -' will reset to the previous branch. It will behave similar
to @{-1} except when a file named '@{-1}' is present. To refer to a file
named '-', use ./- or the -- flag.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy
Kevin Daudt m...@ikke.info writes:
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.
Add following test cases:
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
4) Confirm git reset - works normally even when a file named @{-1}
On 03/10/2015 09:26 PM, Torsten Bögershausen wrote:
On 10.03.15 20:25, Michael Haggerty wrote:
[...]
I'm still trying to infer the spirit of the current behavior, so caveats
here.
This comes from a real-life scenario where a user, somewhere early in
.gitattributes, had
* text
*
git reset -' will reset to the previous branch. It will behave similar
to @{-1} except when a file named '@{-1}' is present. To refer to a file
named '-', use ./- or the -- flag.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy
On 03/10/2015 09:01 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
[...]
It seems to me that setting text=auto should mean that Git uses its
heuristic to guess whether a particular file is text or not, and then
treats the file as if it had text or -text set. If the
Dongcan Jiang dongcan.ji...@gmail.com writes:
Because --graph is about connected history while --no-walk
is about discrete points, it does not make sense to allow
giving these two options at the same time. [1]
This change allows git-show to have such options' combination
as a special case,
On Tue, Mar 10, 2015 at 06:05:46PM +, Dan Langille (dalangil) wrote:
We have made progress I think.
With stock git:
tl;dr: 1 - with a ticket, you get prompted, but hitting ENTER succeeds.
2 - without a ticket, nothing works
With patched git:
tl;dr: 1 - with a ticket,entering
Stefan Beller sbel...@google.com writes:
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
Stefan Beller sbel...@google.com writes:
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
@@
Michael Haggerty mhag...@alum.mit.edu writes:
Well, that's true, but the eol attribute can regain its effect if
binary is followed by text or text=auto. So I guess the simplest
question is as follows. Suppose I have the following .gitattributes:
a.foo eol=crlf
a.foo binary
On Fri, Mar 6, 2015 at 4:59 PM, Soren Brinkmann
soren.brinkm...@xilinx.com wrote:
Add email addresses from additional commonly used tags to the CC-list of
patches. Additional tags are:
- Acked-by
- Reviewed-by
- Tested-by
- Reported-by
- Reviewed-and-tested-by
--suppress-cc=ack
Does this microproject require the feature to be a generic one for every
possible command or should it be limited to some particular commands?
--
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
Junio C Hamano gits...@pobox.com writes:
2. If you want to only correct what is shown at origin to the other
people, then you do not have to update your local repository.
$ git push origin version_1.0 v1.0
$ git push origin version_1.1 v1.1
Colons are missing from this one.
Stefan Beller sbel...@google.com writes:
The continue statements nearby also have an accompanying free(ref);
Signed-off-by: Stefan Beller sbel...@google.com
---
I wonder what happens when dwim_ref() returned 2 or more, though.
bundle.c | 1 +
1 file changed, 1 insertion(+)
diff --git
On Tue, Mar 10, 2015 at 03:09:54PM -0700, Junio C Hamano wrote:
Kevin Daudt m...@ikke.info writes:
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,
Kevin Daudt m...@ikke.info writes:
git log --bisect seems to do something different then git rev-list
--bisect
From git-log(1):
Pretend as if the bad bisection ref refs/bisect/bad was listed and
as if it was followed by --not and the good bisection refs
refs/bisect/good-* on
Stefan Beller sbel...@google.com writes:
On Tue, Mar 10, 2015 at 3:40 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
The continue statements nearby also have an accompanying free(ref);
Signed-off-by: Stefan Beller sbel...@google.com
---
I wonder what
Eric Sunshine sunsh...@sunshineco.com writes:
@@ -2308,14 +2308,14 @@ sendemail.identity::
See linkgit:git-send-email[1] for description. Note that this
setting is not subject to the 'identity' mechanism.
-sendemail.smtpssl (deprecated)::
+sendemail.smtpSSL (deprecated)::
On Tue, Mar 10, 2015 at 3:52 AM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
How about..
.. 1.0-rc1 will appear before 1.0. This key can be specified
multiple times, one for each suffix. The order of suffixes in the
Minor bike-shedding: s/one for each
Kyle J. McKay venit, vidit, dixit 09.03.2015 21:03:
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
Am 09.03.2015 um 20:43 schrieb Jeff King:
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
Koosha Khajehmoogahi koosha.kha...@gmail.com writes:
Does this microproject require the feature to be a generic one for every
possible command or should it be limited to some particular commands?
The Micro is written lazily so that by writing that entry once, it
can tell many students to work
On Tue, Mar 10, 2015 at 3:43 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
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
There was one continue statement without an accompanying `free(ref)`.
Instead of adding that, replace all the freecontinue with a goto
just after writing the refs, where we'd do the free anyway and then
reloop.
Signed-off-by: Stefan Beller sbel...@google.com
---
bundle.c | 11 +--
1 file
83 matches
Mail list logo
