On Fri, Jan 2, 2015 at 3:28 PM, Raphael Kubo da Costa
raphael.kubo.da.co...@intel.com wrote:
The code handling %(upstream:track) and %(upstream:trackshort) assumed
it always had a valid branch that had been sanitized earlier in
populate_value(), and thus did not check the return value of the
On Mon, Jan 26, 2015 at 11:55 AM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
'git add' supports not only `add.ignoreErrors`, but also `add.ignore-errors`
configuration variable.
See 6b3020a2 (add: introduce add.ignoreerrors synonym for
add.ignore-errors, 2010-12-01) for why this patch is
the
AVAILABLE_MAC_OS_X_VERSION_XXX_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_VERSION_YYY
macros are checked and annoying warnings that are being squelched by
the previous change are given?
Yes.
Although Eric didn't specify exactly where when he suggested adding this:
On Feb 6, 2015, at 02:00, Eric Sunshine wrote:
#ifdef
. This preserves any MAC_OS_X_VERSION_MIN_REQUIRED
setting while avoiding the warnings as intended by b195aa00.
Signed-off-by: Kyle J. McKay mack...@gmail.com
Tested on 10.10.2 (Yosemite) and 10.5.8 (Snow Leopard).
Reviewed-by: Eric Sunshine sunsh...@sunshineco.com
More below...
---
git-compat
On Sun, Feb 8, 2015 at 7:05 AM, Joachim Schmitz j...@schmitz-digital.de wrote:
Junio C Hamano gitster at pobox.com writes:
(1) if Makefile gives one, use it without second-guessing with SSIZE_MAX.
(2) if SSIZE_MAX is defined, and if it is smaller than our internal
default, use it.
(3) all
On Tue, Feb 3, 2015 at 4:01 PM, Junio C Hamano gits...@pobox.com wrote:
Jeff King p...@peff.net writes:
diff --git a/t/t4122-apply-symlink-inside.sh
b/t/t4122-apply-symlink-inside.sh
index 942c5cb..fbba8dd 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
On Wed, Jan 14, 2015 at 4:00 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Jan 14, 2015 at 3:54 PM, Jeff King p...@peff.net wrote:
On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
What happens if we rebase with it?
$ git
On Wed, Jan 14, 2015 at 12:33 PM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
This patch constists of two minor changes:
* line-wrap 'git init-db' synopsis
* last possible argument '[directory]' was missed
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git
On Wed, Jan 14, 2015 at 3:54 PM, Jeff King p...@peff.net wrote:
On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
What happens if we rebase with it?
$ git checkout 01319837
$ git rebase -i HEAD^
will yield a todo file with the
On Wed, Jan 14, 2015 at 4:02 PM, Jeff King p...@peff.net wrote:
On Wed, Jan 14, 2015 at 04:00:37PM -0500, Eric Sunshine wrote:
So yeah, the most plausible theory to me so far is unluckiness combined
with pre-1.8.4.2. That should be easy to disprove if Henning tells us
his git version
On Thu, Jan 15, 2015 at 5:31 AM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
Subject: Documentation/init-db.txt: minor style and synopsys fixes
Subject is incorrect now that you're modifying git-init-db.txt and git-init.txt.
This patch constists of two minor changes:
* line-wrap 'git
On Thu, Jan 15, 2015 at 12:08 PM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
Yes, right,
Etiquette on this list is to avoid top-posting [1].
how to do it better? Something like: Documentation,
init-db/init:.? Or something else?
Simplest would be to split it into two patches: one
On Mon, Jan 19, 2015 at 10:51 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ae6791d..7371a5f 100644
--- a/Documentation/config.txt
+++
On Mon, Jan 19, 2015 at 9:20 AM, Kirill A. Shutemov
kirill.shute...@linux.intel.com wrote:
I have tried to fix this before: see 568950388be2, but it doesn't
really work.
I don't know how it happend, but that commit makes interactive rebase to
respect core.abbrev only during --edit-todo, but
On Sunday, January 18, 2015, Yi EungJun semtlen...@gmail.com wrote:
Add an Accept-Language header which indicates the user's preferred
languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG.
Examples:
LANGUAGE= -
LANGUAGE=ko:en - Accept-Language: ko, en;q=0.9, *;q=0.1
On Fri, Jan 16, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote:
Philip Oakley philipoak...@iee.org writes:
die(_(--author '%s': not 'Name email', nor matches any existing
author));
Sounds good. Thanks.
To further bikeshed (particularly if nor is in the mix):
neither 'Name
On Fri, Jan 16, 2015 at 3:58 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index dbe2abf..b06f2e1 100755
--- a/contrib/contacts/git-contacts
+++
On Tue, Jan 27, 2015 at 7:35 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
As per the code, the --repo repo option is equivalent to the repo
argument to 'git push'. [It exists for historical reasons, back from the time
when options had to come before arguments.]
Say so. [But not
On Wed, Jan 28, 2015 at 3:12 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
+ This option is equivalent to the repository argument; the latter
+ wins if both are specified.
To what does latter refer in this case? (I presume it means
On Sun, Jan 25, 2015 at 7:37 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
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 show_as_directory() deliberately generates duplicate
On Sun, Jan 25, 2015 at 7:37 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/t/t3080-list-files.sh b/t/t3080-list-files.sh
new file mode 100755
index 000..6313dd9
--- /dev/null
+++ b/t/t3080-list-files.sh
the minor rewrite above...
Reviewed-by: Eric Sunshine sunsh...@sunshineco.com
---
diff --git a/Makefile b/Makefile
index 7482a4d..57e33f2 100644
--- a/Makefile
+++ b/Makefile
@@ -339,6 +339,8 @@ all::
# return NULL when it receives a bogus time_t.
#
# Define HAVE_CLOCK_GETTIME if your
the
Makefile variable USE_ST_TIMESPEC, as well.
Signed-off-by: Reuben Hawkins reuben...@gmail.com
These patches may or may not deserve a Helped-by:.
With or without the Helped-by: and the minor style fix-up below...
Reviewed-by: Eric Sunshine sunsh...@sunshineco.com
Thanks for the perseverance
-by: Reuben Hawkins reuben...@gmail.com
Reviewed-by: Eric Sunshine sunsh...@sunshineco.com
Note that this patch has a minor and simple-to-resolve conflict with
b195aa00c1 (git-compat-util: suppress unavoidable Apple-specific
deprecation warnings; 2014-12-16) which was just promoted to master.
Junio may
On Wed, Jan 7, 2015 at 10:23 PM, Stefan Beller sbel...@google.com wrote:
From: Ronnie Sahlberg sahlb...@google.com
This adds the atomic protocol option to allow
receive-pack to inform the client that it has
atomic push capability.
Signed-off-by: Stefan Beller sbel...@google.com
---
On Wed, Jan 7, 2015 at 10:23 PM, Stefan Beller sbel...@google.com wrote:
This adds tests for the atomic push option.
The first four tests check if the atomic option works in
good conditions and the last three patches check if the atomic
s/patches/tests/
option prevents any change to be
On Mon, Feb 09, 2015 at 11:33:39AM +0100, Dilyan Palauzov wrote:
the point is that with exactly the same configuration on one
computer there is crash and on another one things work just fine.
I found out that line builtin/blame.c:1675 makes the problems:
if (len) {
printf(blame.c:1676,
On Mon, Feb 9, 2015 at 4:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Currently, if --updateref is specified and the very last reflog entry
is expired or deleted, the reference's value is set to 0{40}. This is
an invalid state of the repository, and breaks, for example, git
fsck and git
randomly invokes free() on whatever
random stack value happens to be reside in strbuf.buf, thus leading to
periodic crashes.
Reported-by: Dilyan Palauzov dilyan.palau...@aegee.org
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
No test accompanying this fix since I don't know how
On Sun, Feb 8, 2015 at 8:28 PM, Jeff King p...@peff.net wrote:
On Sun, Feb 08, 2015 at 10:33:40PM +0100, Dilyan Palauzov wrote:
I use git 2.2.2 and on my system git annotate crashed with the following
log.
I couldn't reproduce it with a few simple examples. Is it possible for
you to show us
On Mon, Feb 9, 2015 at 4:28 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not
set
On Mon, Feb 9, 2015 at 4:33 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Feb 9, 2015 at 4:28 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy
On Wed, Jan 7, 2015 at 5:19 PM, Reuben Hawkins reuben...@gmail.com wrote:
On Wed, Jan 7, 2015 at 1:19 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
This check will automatically set the correct NO_NSEC setting
On Wed, Jan 7, 2015 at 5:31 PM, Reuben Hawkins reuben...@gmail.com wrote:
On Wed, Jan 7, 2015 at 1:37 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
+GIT_CHECK_FUNC(clock_gettime,
+[HAVE_CLOCK_GETTIME=YesPlease
* Silently (no submodule change), if other files change
Test for both conditions and ensure without diff.submodule this works.
Signed-off-by: Doug Kelly dougk@gmail.com
Thanks-to: Eric Sunshine sunsh...@sunshineco.com
Thanks-to: Junio C Hamano gits...@pobox.com
On this project, it's customary
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
This check will automatically set the correct NO_NSEC setting.
This commit message neglects to mention the important point that
you're also now setting USE_ST_TIMESPEC when detected. You might
revise the message like this:
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
OpenSSL version 0.9.6b and before defined the function HMAC_cleanup.
Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and
fall back to HMAC_cleanup when the newer function is missing.
Missing sign-off.
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3
systems being used in production. This change makes compiling git
less tedious on older platforms without CLOCK_MONOTONIC.
The second sentence is
On Wed, Jan 7, 2015 at 4:33 PM, Reuben Hawkins reuben...@gmail.com wrote:
On Wed, Jan 7, 2015 at 1:19 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Jan 7, 2015 at 3:23 PM, Reuben Hawkins reuben...@gmail.com wrote:
+# Define USE_ST_TIMESPEC=YesPlease when stat.st_mtimespec.tv_nsec
On Fri, Feb 20, 2015 at 2:10 PM, Matt Whiteley mattwhite...@gmail.com wrote:
I find the new --dissociate option for clone very helpful but I have a
hard time with the spelling. It seems reasonable to have an alias since
one exists for --recursive.
You may be undermining your own argument for
On Fri, Feb 20, 2015 at 5:06 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Jeff King p...@peff.net writes:
I think these might be getting a little larger than micro.
The ~/.git-credential-cache may be a bit harder, but the case of
~/.git-credentials should follow the same pattern as
On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi koo...@posteo.de wrote:
Subject: Add tests for git-log --merges=show|hide|only
Drop capitalization, mention area you're touching, followed by colon,
followed by short summary:
t4202-log: add --merges= tests
More below.
Signed-off-by:
On Wed, Mar 18, 2015 at 3:04 AM, Paul Tan pyoka...@gmail.com wrote:
t0302 now tests git-credential-store's support for the XDG user-specific
configuration file $XDG_CONFIG_HOME/git/credentials. Specifically:
---
The previous version can be found at [1].
[1]
On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi koo...@posteo.de wrote:
Subject: Update documentations for git-log to include the new
--merges option and also its corresponding config option.
The Subject: should be a short summary of the change; ideally less
than 70 or 72 characters. The
On Sun, Mar 22, 2015 at 6:07 AM, Jeff King p...@peff.net wrote:
Something as simple as reading the stdout from a command
turns out to be rather hard to do right. Doing:
if (!run_command(cmd))
strbuf_read(buf, cmd.out, 0);
can result in deadlock if the child process produces a
On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi koo...@posteo.de wrote:
Subject: Add a new option 'merges' to revision.c
For the subject, mention the area you're touching, followed by a
colon, followed by a short but meaningful summary of the change. Drop
capitalization.
revision: add
On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi koo...@posteo.de wrote:
Subject: Update Bash completion script to include git log --merges option
Nice to see a patch covering this oft-overlooked corner of the project.
It's misleading to say that you're updating it to include the --merges
On Sun, Mar 22, 2015 at 3:57 PM, Torsten Bögershausen tbo...@web.de wrote:
On 22.03.15 19:28, Koosha Khajehmoogahi wrote:
Signed-off-by: Koosha Khajehmoogahi koo...@posteo.de
---
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 5f2b290..ab6f371 100755
--- a/t/t4202-log.sh
+++
On Sun, Mar 22, 2015 at 2:28 PM, Koosha Khajehmoogahi koo...@posteo.de wrote:
Subject: Make git-log honor log.merges option
Drop capitalization, mention area you're touching, followed by colon,
followed by short summary:
log: honor log.merges option
Signed-off-by: Koosha Khajehmoogahi
On Sun, Mar 22, 2015 at 11:24 AM, Dongcan Jiang dongcan.ji...@gmail.com wrote:
This patch is just for discusstion. An option --deepen is added to
'git fetch'. When it comes to '--deepen', git should fetch N more
commits ahead the local shallow commit, where N is indicated by
'--depth=N'. [1]
On Sun, Mar 15, 2015 at 9:50 AM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index f2eb907..4bc156a 100644
--- a/Documentation/git-add.txt
+++
In addition to the points raised by Matthieu and Thomas...
On Sun, Mar 15, 2015 at 11:35 AM, Yurii Shevtsov unge...@gmail.com wrote:
make git diff --no-index $directory $file DWIM better.
Specify the area affected by the change, followed by a colon, followed
by the change summary. Drop the
On Sun, Mar 15, 2015 at 9:50 AM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
t3700-add: added test for --exclude option
Write in imperative mood: s/added/add/
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index
In addition to points raised by Philip and Torsten...
On Sun, Mar 15, 2015 at 9:49 AM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
add: add new --exclude option to git add
No need for redundant to git add, since you already have the add: prefix.
This patch introduces new --exclude option
On Sun, Mar 15, 2015 at 3:07 PM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
t3700-add: added test for --exclude option
s/added/add/
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index f7ff1f5..6f71c67 100755
---
-control.git/265493/focus=265518
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Torsten Bögershausen tbo...@web.de
Helped-by: Philip Oakley philipoak...@iee.org
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git a/builtin/add.c b/builtin/add.c
index 3390933..e165fbc
[re-adding cc:git]
On Sun, Mar 15, 2015 at 2:45 PM, Yurii Shevtsov unge...@gmail.com wrote:
On Sun, Mar 15, 2015 at 11:35 AM, Yurii Shevtsov unge...@gmail.com wrote:
make git diff --no-index $directory $file DWIM better.
Specify the area affected by the change, followed by a colon, followed
On Sun, Mar 15, 2015 at 3:06 PM, Alexander Kuleshov
kuleshovm...@gmail.com wrote:
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com
---
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index f2eb907..fee97ed 100644
On Tue, Mar 17, 2015 at 1:16 AM, Karthik Nayak karthik@gmail.com wrote:
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index df99df4..1625246 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -323,8 +338,8 @@ static int batch_objects(struct batch_options *opt)
}
I don't
On Tue, Mar 17, 2015 at 7:18 PM, Junio C Hamano gits...@pobox.com wrote:
Dongcan Jiang dongcan.ji...@gmail.com writes:
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index b68afef..a989e8f 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -99,7 +99,7 @@ do
On Thu, Mar 19, 2015 at 9:32 PM, Jeff King p...@peff.net wrote:
On Thu, Mar 19, 2015 at 09:16:52PM -0400, Eric Sunshine wrote:
--- /dev/null
+++ b/t/t5312-prune-corruption.sh
@@ -0,0 +1,104 @@
+# we do not want to count on running pack-refs to
+# actually pack it, as it is perfectly
On Fri, Mar 20, 2015 at 1:10 AM, Jeff King p...@peff.net wrote:
On Thu, Mar 19, 2015 at 10:25:32PM -0400, Jeff King wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index c096778..02a03d5 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -524,6 +524,21 @@ test_eval_ () {
test_run_
On Tue, Mar 17, 2015 at 3:28 AM, Jeff King p...@peff.net wrote:
When we are doing a destructive operation like git prune,
we want to be extra careful that the set of reachable tips
we compute is valid. If there is any corruption or oddity,
we are better off aborting the operation and letting
On Tue, Mar 17, 2015 at 3:31 AM, Jeff King p...@peff.net wrote:
When we delete a ref, we have to rewrite the entire
packed-refs file. We take this opportunity to curate the
packed-refs file and drop any entries that are crufty or
broken.
Dropping broken entries (e.g., with bogus names, or
improved the readability of the result. So overall I think this
is a very positive change; I doubt it will get in people's way very
often, and I look forward to having one less thing to worry about
handling manually in review. The biggest downside is that I may have
automated Eric Sunshine out
On Sat, Mar 21, 2015 at 8:50 AM, Yurii Shevtsov unge...@gmail.com wrote:
Signed-off-by: Yurii Shevtsov unge...@gmail.com
---
diff --git a/diff-no-index.c b/diff-no-index.c
index 265709b..9a3439a 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -97,8 +97,39 @@ static int
On Fri, Mar 20, 2015 at 6:36 AM, mdc...@seznam.cz wrote:
I am trying to setup my git ignore (resp. .git/info/exclude) so that I exclude
all directories and files except the content of directories that I
specifically include (incl. anything within them recursively).
I set the
On Fri, Mar 20, 2015 at 11:15 AM, Jason Karns karns...@gmail.com wrote:
There appears to be a bug in the bash completion for git-branch when
attempting to complete the remote ref argument for --set-upstream-to=
When:
$ git branch --set-upstream-to=origin/mastTAB
I would expect it to
On Sun, Mar 22, 2015 at 1:11 AM, Junio C Hamano gits...@pobox.com wrote:
When a commit changes a path P that used to be a file to a directory
and create a new path P/X in it, git show would say that file P
s/create/creates/
More below...
was removed and file P/X was created for such a
On Tuesday, March 17, 2015, Michael Haggerty mhag...@alum.mit.edu wrote:
Implement wrappers for strtol() and strtoul() that are safer and more
convenient to use.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff --git a/numparse.c b/numparse.c
new file mode 100644
index
On Wed, Mar 18, 2015 at 3:26 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Mar 18, 2015 at 3:04 AM, Paul Tan pyoka...@gmail.com wrote:
t0302 now tests git-credential-store's support for the XDG user-specific
configuration file $XDG_CONFIG_HOME/git/credentials. Specifically
On Wed, Mar 18, 2015 at 6:47 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 03/18/2015 07:27 PM, Eric Sunshine wrote:
On Tuesday, March 17, 2015, Michael Haggerty mhag...@alum.mit.edu wrote:
Implement wrappers for strtol() and strtoul() that are safer and more
convenient to use
On Fri, Mar 6, 2015 at 6:18 AM, Karthik Nayak karthik@gmail.com wrote:
'git -C ' unhelpfully dies with error Cannot change to '',
whereas the shell treats `cd ' as a no-op. Taking the shell's
behavior as a precedent, teach git to treat `-C ' as a no-op, as
well.
Test to check the no-op
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
On Tue, Mar 10, 2015 at 1:52 PM, Sudhanshu Shekhar
sudshekha...@gmail.com wrote:
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 - in the presence of file named - with previous
-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/CodingGuidelines | 2 +-
Documentation/blame-options.txt| 2 +-
Documentation/config.txt | 242
On Fri, Mar 6, 2015 at 3:55 AM, Dongcan Jiang dongcan.ji...@gmail.com wrote:
Forbid log --graph --no-walk
Style: drop capitalization in the Subject: line. Also prefix with the
command or module being modified, followed by a colon. So:
log: forbid combining --graph and --no-walk
or:
On Sun, Mar 8, 2015 at 11:40 AM, Kyle J. McKay mack...@gmail.com wrote:
Depending on how gpg was built, it may issue the following
message to stderr when run:
Warning: using insecure memory!
Unfortunately when running the test, that message gets
collected in the stdout result of git show
On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
On Sun, Mar 08, 2015 at 05:43:41PM -0400, Eric Sunshine wrote:
On Sun, Mar 8, 2015 at 11:40 AM, Kyle J. McKay mack...@gmail.com wrote:
Warning: using insecure memory!
Unfortunately when running the test
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 the commit
message then elaborates. Unfortunately,
On Sun, Mar 8, 2015 at 7:03 AM, Hiroyuki Sano sh19910...@gmail.com wrote:
Add regex patterns for CSS. The word regex maches selectors, properties,
and values. On the other hand, the funcname regex matches lines contains
the curly brace character.
Signed-off-by: Hiroyuki Sano
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, and even leads to segfaults, refuse to use
both options together.
On Sun, Mar 8, 2015 at 7:03 AM, Hiroyuki Sano sh19910...@gmail.com wrote:
attrs: add css to the list of userdiff bulit-in patterns
s/bulit/built/
Signed-off-by: Hiroyuki Sano sh19910...@gmail.com
---
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index
On Sat, Mar 7, 2015 at 5:49 AM, karthik nayak karthik@gmail.com wrote:
This iteration looks sensible, except that the Subject reads
strange. Will queue with minor tweaks to the log message,
and perhaps with a fix to unreadable *(*argv)[1] that was
mentioned elsewhere.
Hey could you tell
.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy matthieu@grenoble-inp.fr
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
---
I have changed the logic to ensure argv[0] isn't changed at any point.
Creating
On Fri, Mar 13, 2015 at 9:04 AM, Dongcan Jiang dongcan.ji...@gmail.com wrote:
This patch is just for discusstion. An option --deepen is added to
'git fetch'. When it comes to '--deepen', git should fetch N more
commits ahead the local shallow commit, where N is indicated by
'--depth=N'. [1]
option
is specified
4) Confirm git reset - works normally even when a file named @{-1} is
present
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy matthieu@grenoble-inp.fr
Helped-by: David Aguilar dav...@gmail.com
Signed-off-by: Sudhanshu Shekhar sudshekha
-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Sundararajan R dyou...@gmail.com
---
Have made the modifications suggest by you, Eric.
Removed the part where the user is told that he can use ./- instead.
builtin/reset.c | 15 ++-
1 file changed, 14 insertions(+), 1
the handling of these cases.
Also add a test to verify that reset - behaves like reset @{-1} when none
of the above cases are true.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Torsten Bögershausen tbo...@web.de
Torsten already pointed out this botch.
Helped-by: Eric Sunshine sunsh
On Wed, Mar 11, 2015 at 2:49 AM, Paul Tan pyoka...@gmail.com wrote:
t0302 now tests git-credential-store's support for the XDG user-specific
configuration file $XDG_CONFIG_HOME/git/credentials. Specifically:
* Ensure that the XDG file is strictly opt-in. It should not be created
by git at
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
+++
...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy matthieu@grenoble-inp.fr
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
---
diff --git a/builtin/reset.c b/builtin/reset.c
index 4c08ddc..8abd300 100644
--- a/builtin/reset.c
+++ b/builtin
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 Wed, Mar 11, 2015 at 2:49 AM, Paul Tan pyoka...@gmail.com wrote:
git-credential-store now supports an additional default credential file
at $XDG_CONFIG_HOME/git/credentials. However, ~/.git-credentials takes
precedence over it for backwards compatibility. To make the precedence
ordering
On Fri, Mar 13, 2015 at 12:53 AM, Jeff King p...@peff.net wrote:
We use this to test http pushing with a restricted
commandline. Other scripts (like t5551, which does http
fetching) will want to use it, too.
Signed-off-by: Jeff King p...@peff.net
---
As we discussed a while ago, this is the
- abbreviation, add
docs and tests; 2009-01-17).
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Helped-by: Matthieu Moy matthieu@grenoble-inp.fr
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
---
Eric, I have added a user_input variable
option is
specified
4) Confirm git reset - works normally even when a file named @{-1} is
present
Does it concern you that all new tests pass except the last one even
when patch 1/2 is not applied? I would have expected most or all of
these tests to fail without patch 1/2.
Helped-by: Eric
On Wed, Mar 11, 2015 at 8:33 PM, Junio C Hamano gits...@pobox.com wrote:
* nd/list-files (2015-02-09) 21 commits
- t3080: tests for git-list-files
- list-files: -M aka diff-cached
- list-files -F: show submodules with the new indicator ''
- list-files: add -F/--classify
- list-files:
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
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
901 - 1000 of 3596 matches
Mail list logo
