On 07/09/2014 11:57 PM, Junio C Hamano wrote:
Eric Wong normalper...@yhbt.net writes:
Junio C Hamano gits...@pobox.com wrote:
Johannes Sixt j...@kdbg.org writes:
Am 08.07.2014 21:34, schrieb Jens Lehmann:
And Msysgit complains
error: fchmod on c:/xxxt/trash
Signed-off-by: Rene Scharfe l@web.de
---
builtin/log.c | 2 +-
pretty.c | 2 +-
rerere.c | 4 ++--
sha1_name.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 27c1b65..4389722 100644
--- a/builtin/log.c
+++ b/builtin/log.c
Signed-off-by: Rene Scharfe l@web.de
---
merge-recursive.c | 2 +-
pathspec.c| 2 +-
url.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index b5c3c53..fad7b2c 100644
--- a/merge-recursive.c
+++
Hi Junio,
Junio C Hamano writes:
Fabian Ruch baf...@gmail.com writes:
The command line used to recreate root commits specifies the
erroneous option `--allow-empty-message`. If the root commit has an
empty log message, the replay of this commit should fail and the
rebase should be interrupted
On Wed, Jul 9, 2014 at 4:59 PM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
+static void replace_parents(struct strbuf *buf, int argc, const char **argv)
+{
+ struct strbuf new_parents = STRBUF_INIT;
+ const char *parent_start,
Junio C Hamano gits...@pobox.com writes:
After thinking about it a bit more, I think file, line support
needs to be done not as a mere client of the generic, uncached
git_config() API that we have had for forever, like the current
iteration, but needs to know a bit more about the state the
Build the commit_list of parents by calling commit_list_append() twice
instead of allocating and linking the items by hand. This makes the
code shorter and simpler. Rename the commit_list from parent to parents
(plural) while at it because there are two of them.
Signed-off-by: Rene Scharfe
Signed-off-by: Rene Scharfe l@web.de
---
commit.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index fb7897c..61d2e13 100644
--- a/commit.c
+++ b/commit.c
@@ -447,12 +447,7 @@ struct commit_list *copy_commit_list(struct commit_list
*list)
fsck_commit_buffer() checks that the number of items in the parents
list of a commit matches the number of parent lines in its buffer or --
if a graft is used -- the number of parents in that graft. Simplify
the code by using commit_list_count() instead of counting by hand.
Also use different
Tanay Abhra tanay...@gmail.com writes:
Noted, still I want to add that even when GSoC finishes, I won't leave the
work unfinished. I had said that I wanted to continue being part of the Git
community and I mean that. :)
This is a good thing, but you shouldn't rely on it for your GSoC. After
Pretty much one year ago
(94b410bba864, Jul 12 2013, .mailmap: Map email addresses to names)
I cleaned up the output of `git shortlog -sne` of git.git by writing a
.mailmap file fot the git.git project.
Now I find some time again for another review.
During the year Jens, Kazuki and Trần
On Tue, Jul 8, 2014 at 4:31 PM, Junio C Hamano gits...@pobox.com wrote:
Fabian Ruch baf...@gmail.com writes:
It is true that a failed hook script might not output any diagnosis...
I think the message originally came from 0becb3e4 (rebase -i:
interrupt rebase when commit --amend failed during
Hi Andrew,
thanks for your review and sorry that I forgot to cc the bug fix to you.
Andrew Wong writes:
On Tue, Jul 8, 2014 at 4:31 PM, Junio C Hamano gits...@pobox.com wrote:
Fabian Ruch baf...@gmail.com writes:
It is true that a failed hook script might not output any diagnosis...
I think
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
After thinking about it a bit more, I think file, line support
needs to be done not as a mere client of the generic, uncached
git_config() API that we have had for forever, like the current
iteration,
Christian Couder christian.cou...@gmail.com writes:
Is this really an error? It may be a warning-worthy situation for a
user or a script to end up doing a no-op graft, e.g.
git replace --graft HEAD HEAD^
but I wonder if it is more convenient to signal an error (like this
patch
Fabian Ruch baf...@gmail.com writes:
...
Do you want me to replace this patch with a patch
rebase -i: Always allow picking of commits with empty log messages
that makes git-rebase--interactive cherry-pick commits using
--allow-empty-message?
I do not want any particular behaviour
On Thu, Jul 10, 2014 at 12:35 PM, Fabian Ruch baf...@gmail.com wrote:
That is still taken care of by exit_with_patch here.
Oh, that's right. Ok, go ahead and remove the third warning then. Thanks!
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
$ git p4 sync --detect-branches --import-labels //main@all
... Lots of useful information elided
fatal: ambiguous argument 'git-p4-tmp/8031': unknown revision or path not in
the working tree.
Use '--' to separate paths from revisions, like this:
'git command [revision...] -- [file...]'
Command
Fabian Ruch baf...@gmail.com writes:
Your reply suggests that git-rebase--interactive was wrong from the
beginning and that the replay of commits without any message should be
allowed. This would reconcile the first case with the second. In fact,
since neither of them alters the changes
Junio C Hamano gits...@pobox.com writes:
Christian Couder christian.cou...@gmail.com writes:
Is this really an error? It may be a warning-worthy situation for a
user or a script to end up doing a no-op graft, e.g.
git replace --graft HEAD HEAD^
but I wonder if it is more
Jeff King p...@peff.net writes:
I know this is existing code you are moving, but I noticed it looks ripe
for using skip_prefix. Perhaps while we are in the area we should do the
following on top of your patch (I'd also be happy for it be squashed
in, but that may be too much in one patch).
I
Is this using NFS, or local storage?
On 10/07/14 18:30, Bill Door wrote:
$ git p4 sync --detect-branches --import-labels //main@all
... Lots of useful information elided
fatal: ambiguous argument 'git-p4-tmp/8031': unknown revision or path not in
the working tree.
Use '--' to separate paths
All local storage.
…Duane
On Jul 10, 2014, at 11:07 AM, Luke Diamand l...@diamand.org wrote:
Is this using NFS, or local storage?
On 10/07/14 18:30, Bill Door wrote:
$ git p4 sync --detect-branches --import-labels //main@all
... Lots of useful information elided
fatal: ambiguous
Some additional investigation.
I am working in a copy of a repository that was originally used to pull the
data
from Perforce. As part of my experiments to figure out this problem, I deleted
the contents of .git/git-p4-tmp/.
I noticed that git-p4 would continue if those files were present.
On Thu, Jul 10, 2014 at 10:59:36AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I know this is existing code you are moving, but I noticed it looks ripe
for using skip_prefix. Perhaps while we are in the area we should do the
following on top of your patch (I'd also be
Torsten Bögershausen tbo...@web.de writes:
Isn't the whole problem starting here:
in config.c:
fd = hold_lock_file_for_update(lock, config_filename, 0);
In lockfile.c:
/* This should return a meaningful errno on failure */
int hold_lock_file_for_update(struct lock_file *lk, const
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
CC credential-store.o
In file included from /usr/lib/.../xmmintrin.h:31:0,
from /usr/lib/.../emmintrin.h:31,
from git-compat-util.h:708,
Fabian Ruch baf...@gmail.com writes:
There are two kinds of to-do list commands available. One kind
replays a commit (`pick`, `reword`, `edit`, `squash` and `fixup` that
is) and the other executes a shell command (`exec`). We will call the
first kind replay commands.
The two kinds of tasks
It looks like I totally missed the topic sk/mingw-unicode-spawn-args.
Now it's in master, and it breaks lots of test cases for me:
t0050-filesystem
t0110-urlmatch-normalization
t4014-format-patch
t4041-diff-submodule-option
t4120-apply-popt
t4201-shortlog
t4205-log-pretty-formats
On Thu, Jul 10, 2014 at 9:59 PM, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
s/x64_64/x86_64/
Should have written amd64 to avoid the typo :).
CC credential-store.o
In file included from
On Wed, Jul 09, 2014 at 11:46:14AM +0100, Peter Krefting wrote:
Jeff King:
I did some digging, and I think the public API is setlocale with a NULL
parameter, like:
printf(%s\n, setlocale(LC_MESSAGES, NULL));
That still will end up like en_US.UTF-8, though;
And it only yields the
On Thu, Jul 10, 2014 at 09:59:37PM +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
Weird. It compiles fine on my x86_64 box (Debian unstable, gcc
4.9.0-10). Can you tell us more about your environment?
-Peff
--
To
On Thu, 2014-07-10 at 21:59 +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
CC credential-store.o
In file included from /usr/lib/.../xmmintrin.h:31:0,
What's in the ...?
Because if you're using headers from
Jeff King p...@peff.net writes:
On Mon, Jun 16, 2014 at 01:55:57PM +0100, Philip Oakley wrote:
+Error Messages
+
+ - We typically do not end error messages with a full stop. While
+ we've been rather inconsistent in the past, these days we mostly
+ settle on no punctuation.
Unlike
On Thu, 2014-07-10 at 00:07 -0400, Jeff King wrote:
On Wed, Jul 09, 2014 at 03:36:51PM -0700, Jacob Keller wrote:
+static int parse_sort_string(const char *arg)
+{
+ int sort = 0;
+ int flags = 0;
+
+ if (*arg == '-') {
+ flags |= REVERSE_SORT;
+ arg++;
On Wed, 2014-07-09 at 21:14 -0700, Junio C Hamano wrote:
On Wed, Jul 9, 2014 at 4:49 PM, Keller, Jacob E
jacob.e.kel...@intel.com wrote:
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote:
What kind of things are missing, exactly? Perhaps that is something
you need to fix, instead
On Thu, Jul 10, 2014 at 01:36:05PM -0700, Junio C Hamano wrote:
Perhaps there are others (we do not have to be exhaustive, but it makes
sense to think for a moment while we are here).
I do not want to forever be waiting for a reroll, so let's queue
this and advance it to 'next' soonish,
On Thu, Jul 10, 2014 at 08:39:57PM +, Keller, Jacob E wrote:
Ok, I'll give it a shot. All I know for sure right now is running the
test directly passed and running from make test it failed.
When you say directly, I assume you mean cd t ./1234-xxx.sh.
You can also run a single-shot test
On Thu, Jul 10, 2014 at 10:23 PM, Jeff King wrote:
On Thu, Jul 10, 2014 at 09:59:37PM +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
Weird. It compiles fine on my x86_64 box (Debian unstable, gcc
4.9.0-10).
On Thu, Jul 10, 2014 at 10:33 PM, David Turner wrote:
On Thu, 2014-07-10 at 21:59 +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
CC credential-store.o
In file included from
Junio C Hamano gits...@pobox.com writes:
Jens Lehmann jens.lehm...@web.de writes:
I agree, but this case is special. The test asserts that nobody
added, modified or removed *anything* inside the .git directory.
The reason for problem we are seeing here is that I have to
remove the
On Thu, 2014-07-10 at 22:44 +0200, Tuncer Ayaz wrote:
On Thu, Jul 10, 2014 at 10:33 PM, David Turner wrote:
On Thu, 2014-07-10 at 21:59 +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
linux x64_64. Any idea what's wrong?
CC
On 2014-07-10 21.49, Junio C Hamano wrote:
[]
If we limit the case to Inherit permissions from the file we are
replacing by taking a lock on it, which is the topic of discussion
in this thread, we do not have to worry about how to configure the
value (we do not have to) and adding a new
Torsten Bögershausen tbo...@web.de writes:
On 2014-07-10 21.49, Junio C Hamano wrote:
[]
If we limit the case to Inherit permissions from the file we are
replacing by taking a lock on it, which is the topic of discussion
in this thread, we do not have to worry about how to configure the
On Thu, 2014-07-10 at 15:34 -0400, Jeff King wrote:
On Thu, Jul 10, 2014 at 10:59:36AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I know this is existing code you are moving, but I noticed it looks ripe
for using skip_prefix. Perhaps while we are in the area we
On Thu, Jul 10, 2014 at 10:53 PM, David Turner wrote:
On Thu, 2014-07-10 at 22:44 +0200, Tuncer Ayaz wrote:
On Thu, Jul 10, 2014 at 10:33 PM, David Turner wrote:
On Thu, 2014-07-10 at 21:59 +0200, Tuncer Ayaz wrote:
The changes in 745224e0 don't seem to build here with gcc-4.9 on
Sorry, didn't test properly when I tried with/without config.mak, and
PROFILE=BUILD was the problem. I had that in config.mak based on
information gathered from INSTALL and Makefile. To be clear, is
PROFILE=BUILD (still) supported?
--
To unsubscribe from this list: send the line unsubscribe git in
Jeff King p...@peff.net writes:
Perhaps it would be easier to read (and would have made the logic error
you are fixing more obvious) as:
if (extra-len payload_size) {
if (!verify_signed_buffer(...))
status = 0; /* good; all other code paths leave it as -1 */
On Thu, 2014-07-10 at 04:14 +, Junio C Hamano wrote:
On Wed, Jul 9, 2014 at 4:49 PM, Keller, Jacob E
jacob.e.kel...@intel.com wrote:
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote:
What kind of things are missing, exactly? Perhaps that is something
you need to fix, instead
Keller, Jacob E jacob.e.kel...@intel.com writes:
On Thu, 2014-07-10 at 15:34 -0400, Jeff King wrote:
On Thu, Jul 10, 2014 at 10:59:36AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I know this is existing code you are moving, but I noticed it looks ripe
for using
On Fri, 2014-07-11 at 00:12 +0200, Tuncer Ayaz wrote:
Sorry, didn't test properly when I tried with/without config.mak, and
PROFILE=BUILD was the problem. I had that in config.mak based on
information gathered from INSTALL and Makefile. To be clear, is
PROFILE=BUILD (still) supported?
For
This is an updated version of a script I wrote a couple years ago for
debugging the PHC when writing a new driver. I figured that it might be
handy for the LinuxPTP project to include, as it can give some insight
into the PHC directly. I have updated it to make use of the shared code
here, in
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index e0710ad5b294..098dcdfe1ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/*.d
/*.o
+/.version
/hwstamp_ctl
/phc2sys
/pmc
--
Hi,
Jacob Keller wrote:
Subject: gitignore: add .version as this is generated during a make
What program generates that file? When I build on a Debian machine, I
get
$ make
[...]
SUBDIR templates
$ ls -la .version
ls: cannot access .version: No
Jonathan Nieder jrnie...@gmail.com writes:
Jacob Keller wrote:
Subject: gitignore: add .version as this is generated during a make
What program generates that file? When I build on a Debian machine, I
get
$ make
[...]
SUBDIR templates
$ ls -la .version
Jacob Keller jacob.e.kel...@intel.com writes:
This is an updated version of a script I wrote a couple years ago for
I suspect that this is not for us ;-)
--
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 Thu, 2014-07-10 at 16:20 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
This is an updated version of a script I wrote a couple years ago for
I suspect that this is not for us ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body
On Thu, 2014-07-10 at 16:13 -0700, Jonathan Nieder wrote:
Hi,
Jacob Keller wrote:
Subject: gitignore: add .version as this is generated during a make
What program generates that file? When I build on a Debian machine, I
get
$ make
[...]
SUBDIR templates
Make the parsing of the --sort parameter more readable by having
skip_prefix keep our pointer up to date.
Authored-by: Jeff King p...@peff.net
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com
---
builtin/tag.c | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King p...@peff.net
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com
---
- v4
* base on top of suggested change by Jeff King to use
Hi Jeff,
Another attempt to remove this intermediate allocator. ;-)
I didn't think I would like this approach before I started to look at
doing this patch, but now I think I rather like it!
The first patch uses an inline function (alloc_node()) to implement the
allocators, redefining the macro
In order to encapsulate the setting of the unique commit index, commit
969eba63 (commit: push commit_index update into alloc_commit_node,
10-06-2014) introduced a (logically private) intermediary allocator
function. However, this function (alloc_raw_commit_node()) was declared
as a public
The 'commit_count' static variable is used in alloc_commit_node()
to set the 'index' field of the commit structure to a unique value.
This variable assumes the same value as the 'count' field of the
'commit_state' allocator state structure, which may be used in its
place.
Signed-off-by: Ramsay
On Fri, Jul 11, 2014 at 12:58:31AM +0100, Ramsay Jones wrote:
#define DEFINE_ALLOCATOR(name, type) \
-static unsigned int name##_allocs; \
+static struct alloc_state name##_state; \
void
On Fri, Jul 11, 2014 at 12:59:48AM +0100, Ramsay Jones wrote:
The 'commit_count' static variable is used in alloc_commit_node()
to set the 'index' field of the commit structure to a unique value.
This variable assumes the same value as the 'count' field of the
'commit_state' allocator state
When git checkout checks out a branch, create or update the
cache-tree so that subsequent operations are faster.
update_main_cache_tree learned a new flag, WRITE_TREE_REPAIR. When
WRITE_TREE_REPAIR is set, portions of the cache-tree which do not
correspond to existing tree objects are
Do not treat known-invalid trees as errors even when their subtree_nr is
incorrect. Because git already knows that these trees are invalid,
an incorrect subtree_nr will not cause problems.
Add a couple of comments.
Signed-off-by: David Turner dtur...@twitter.com
---
test-dump-cache-tree.c | 4
Add tests to confirm that invalidation of subdirectories neither over-
nor under-invalidates.
Signed-off-by: David Turner dtur...@twitter.com
---
t/t0090-cache-tree.sh | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/t/t0090-cache-tree.sh
During the commit process, update the cache-tree. Write this updated
cache-tree so that it's ready for subsequent commands.
Add test code which demonstrates that git commit now writes the cache
tree. Make all tests test the entire cache-tree, not just the root
level.
Signed-off-by: David Turner
On 11/07/14 01:09, Jeff King wrote:
On Fri, Jul 11, 2014 at 12:58:31AM +0100, Ramsay Jones wrote:
#define DEFINE_ALLOCATOR(name, type)\
-static unsigned int name##_allocs; \
+static struct alloc_state name##_state;
On 11/07/14 01:30, Jeff King wrote:
On Fri, Jul 11, 2014 at 12:59:48AM +0100, Ramsay Jones wrote:
The 'commit_count' static variable is used in alloc_commit_node()
to set the 'index' field of the commit structure to a unique value.
This variable assumes the same value as the 'count' field of
Hi,
[PATCH V8]: Moved the contents of config-set.c to config.c for future
convenience. Reverted
test 'find value with misspelled key' to the one in v5. See [10] for
the discussion.
[PATCH V7]: Style nits and a broken chain corrected in
`t/t1308-config-set.sh`. See
[9] for the
Expose the `config_set` C API as a set of simple commands in order to
facilitate testing. Add tests for the `config_set` API as well as for
`git_config_get_*()` family for the usual config files.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
.gitignore| 1 +
Makefile
Currently `git_config()` uses a callback mechanism and file rereads for
config values. Due to this approach, it is not uncommon for the config
files to be parsed several times during the run of a git program, with
different callbacks picking out different variables useful to themselves.
Add a
74 matches
Mail list logo
