Re: Bug report: Author/Commit date in ISO 8601 format

2014-08-27 Thread Oliver Busch
Am 26.08.2014 um 23:41 schrieb demerphq: On 26 August 2014 16:22, Jeff King p...@peff.net mailto:p...@peff.net wrote: On Tue, Aug 26, 2014 at 10:10:33AM -0400, Jason Pyeron wrote: But I am not sure that omitted means can be replaced with a space. And while you can define

[PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Jeff King
Usually when we parse a commit, we read it line by line and handle each individual line (e.g., parse_commit and parse_commit_header). Sometimes, however, we only care about extracting a single header. Code in this situation is stuck doing an ad-hoc parse of the commit buffer. Let's provide a

[PATCH v2 2/6] record_author_info: fix memory leak on malformed commit

2014-08-27 Thread Jeff King
If we hit the end-of-header without finding an author line, we just return from the function. We should jump to the fail_exit path to clean up the buffer that we may have allocated. Signed-off-by: Jeff King p...@peff.net --- commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH v2 5/6] determine_author_info: reuse parsing functions

2014-08-27 Thread Jeff King
Rather than parsing the header manually to find the author field, and then parsing its sub-parts, let's use find_commit_header and split_ident_line. This is shorter and easier to read, and should do a more careful parsing job. For example, the current parser could find the end-of-email

[PATCH v2 6/6] determine_author_info: copy getenv output

2014-08-27 Thread Jeff King
When figuring out the author name for a commit, we may end up either pointing to const storage from getenv(GIT_AUTHOR_*), or to newly allocated storage based on an existing commit or the --author option. Using const pointers to getenv's return has two problems: 1. It is not guaranteed that the

[PATCH v2 4/6] use strbufs in date functions

2014-08-27 Thread Jeff King
Many of the date functions write into fixed-size buffers. This is a minor pain, as we have to take special precautions, and frequently end up copying the result into a strbuf or heap-allocated buffer anyway (for which we sometimes use strcpy!). Let's instead teach parse_date, datestamp, etc to

[PATCH v2 3/6] record_author_info: use find_commit_header

2014-08-27 Thread Jeff King
This saves us some manual parsing and makes the code more readable. Signed-off-by: Jeff King p...@peff.net --- commit.c | 22 -- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/commit.c b/commit.c index 4ff8c66..9416d84 100644 --- a/commit.c +++ b/commit.c @@

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Jeff King
On Tue, Aug 26, 2014 at 03:09:34PM -0700, Junio C Hamano wrote: -- [New Topics] There are a few misc topics of mine that I'd like to ping on: - jk/contrib-subtree-make-all; you picked up the topic, but it's not in pu or what's cooking.

Re: [PATCH v2 0/6] clean up author parsing

2014-08-27 Thread Christian Couder
On Wed, Aug 27, 2014 at 9:55 AM, Jeff King p...@peff.net wrote: [2/6]: record_author_info: fix memory leak on malformed commit [3/6]: record_author_info: use find_commit_header s/record_author_info/record_author_date/ Thanks, Christian. -- To unsubscribe from this list: send the line

Re: [PATCH 3/5] checkout --to: no auto-detach if the ref is already checked out

2014-08-27 Thread Duy Nguyen
On Thu, Jul 31, 2014 at 1:03 AM, Junio C Hamano gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: As an error message that is completely sufficient. The advice messages are meant to teach the user about the normal parts of the toolchest to use in a situation of

Re: [RFC/PATCH] Windows tests: let $TRASH_DIRECTORY point to native Windows path

2014-08-27 Thread Duy Nguyen
Ping... On Wed, Jul 30, 2014 at 2:43 AM, Karsten Blees karsten.bl...@gmail.com wrote: MSYS programs typically understand native Windows paths (e.g C:/git), but native Windows programs (including MinGW) don't understand MSYS paths (e.g. /c/git). On Windows, set TRASH_DIRECTORY to the absolute

Git Bug Report: bisect run failed to locate the right commit

2014-08-27 Thread 李祐棠
is a little complicated, and I have to compress the test script and result in tar since mail server think the test code as spam. it's very sorry to bother you. Sincerely YodaLee 20140827 testfile.tar Description: testfile.tar

Re: [RFC] add detached HEAD to --all listing

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 05:18:21PM +0300, Max Kirillov wrote: Could HEAD be added to list of heads while using --all switch? To which command? If you mean git branch, I think the detached HEAD is already mentioned: $ git branch * (detached from 1290ebd) master If you mean git log, I

Re: Git Bug Report: bisect run failed to locate the right commit

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 01:42:45PM +, 李祐棠 wrote: Here is the manual test script I use is manualscript.py: I use git bisect manually, search from 1.2.9(bad) to 1.2.8(good), I locate the commit that fixes this issue. The running log is attached in this file(manual). However if I use

Re: [PATCH v2 0/6] clean up author parsing

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 11:06:27AM +0200, Christian Couder wrote: On Wed, Aug 27, 2014 at 9:55 AM, Jeff King p...@peff.net wrote: [2/6]: record_author_info: fix memory leak on malformed commit [3/6]: record_author_info: use find_commit_header s/record_author_info/record_author_date/

[RFC] add detached HEAD to --all listing

2014-08-27 Thread Max Kirillov
Hello. Could HEAD be added to list of heads while using --all switch? Detached heads are not something very unusual and incorrect, in submodules for example, or for some scripts. Having to specify it additionally when I meet such checkout feels like some flaw. What are opinions on that, could it

Re: Git Bug Report: bisect run failed to locate the right commit

2014-08-27 Thread Christian Couder
Hi, On Wed, Aug 27, 2014 at 3:42 PM, 李祐棠 r01942...@ntu.edu.tw wrote: Dear Git developers: I just found a suspicious bug that might cause by git-bisect run. Version: The git version is 1.9.2, running on Archlinux 3.14.2 The step to produce the error: Here is the repository I participate:

Re: [RFC] add detached HEAD to --all listing

2014-08-27 Thread Max Kirillov
On Wed, Aug 27, 2014 at 5:22 PM, Jeff King p...@peff.net wrote: If you mean git log, I think it is included there, too: $ git log --decorate --oneline --all 685450f (HEAD) more 1290ebd (master) foo I meant git log, did not know it's there. Where I actually would like to see it in gitk

log.decorate=auto not documented

2014-08-27 Thread Peter Eisentraut
The log.decorate=auto value, which is mentioned in the release notes of Git 2.1, is not documented in either git-config.txt or git-log.txt. It should also be documented that auto corresponds to short. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v6 2/6] Add git_env_ulong() to parse environment variable

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Aug 26, 2014 at 02:54:11PM -0700, Junio C Hamano wrote: A worse position is to have git_env_bool() that says empty is false and add a new git_env_ulong() that says empty is unset. We should pick one or the other and use it for both. Yeah, I agree

Re: mktree: multiple same-named objects

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Aug 27, 2014 at 12:41:57AM -0400, David Turner wrote: git mktree seems to allow the creation of a tree object with multiple objects of the same name but different SHAs. Yeah, I don't think we do many quality checks there. Ditto for git hash-object.

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Aug 26, 2014 at 03:09:34PM -0700, Junio C Hamano wrote: -- [New Topics] There are a few misc topics of mine that I'd like to ping on: - jk/contrib-subtree-make-all; you picked up the topic, but it's

Re: [PATCH v2] teach fast-export an --anonymize option

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh new file mode 100755 index 000..f76ffe4 --- /dev/null +++ b/t/t9351-fast-export-anonymize.sh @@ -0,0 +1,117 @@ +#!/bin/sh + +test_description='basic tests for

Re: [PATCH 3/5] checkout --to: no auto-detach if the ref is already checked out

2014-08-27 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Jul 31, 2014 at 1:03 AM, Junio C Hamano gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: As an error message that is completely sufficient. The advice messages are meant to teach the user about the normal parts of the

Re: mktree: multiple same-named objects

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 08:17:15AM -0700, Junio C Hamano wrote: I am somewhat against outright removing the capability to write out invalid objects deliberately from these low level tools, because we would need a way to easily reproduce bugs in end-user facing tools by other people who claim

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 08:31:51AM -0700, Junio C Hamano wrote: - jk/send-pack-many-refspecs; this is in pu, but I didn't see it in what's cooking. I'm concerned that the ulimit test gave you trouble and you punted on it. :) It was picked up after the day's edition of What's

Re: Improving the git remote command

2014-08-27 Thread David Aguilar
On Tue, Aug 26, 2014 at 01:33:12PM -0400, Jeff King wrote: On Tue, Aug 26, 2014 at 10:24:35AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... But we are left with three options: 1. Add git remote list with verbose output. This is bad because it differs

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Aug 27, 2014 at 08:31:51AM -0700, Junio C Hamano wrote: - jk/send-pack-many-refspecs; this is in pu, but I didn't see it in what's cooking. I'm concerned that the ulimit test gave you trouble and you punted on it. :) It was picked up

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 09:38:09AM -0700, Junio C Hamano wrote: Makes sense. I think the v2 I sent[1] is OK, and as far as I was planning to take it for now (there were some other possible enhancements discussed, but I think those can happen in-tree if somebody feels like working on it).

Re: [PATCH v2] teach fast-export an --anonymize option

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 09:01:02AM -0700, Junio C Hamano wrote: +# this also covers commit messages +test_expect_success 'stream omits path names' ' + ! fgrep base stream + ! fgrep foo stream + ! fgrep subdir stream + ! fgrep bar stream + ! fgrep xyzzy stream +' I

[PATCH v3] teach fast-export an --anonymize option

2014-08-27 Thread Jeff King
Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. It would be useful if they could produce a repository that has a similar shape to its history and tree, but without leaking any information. This

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-08-27 Thread Junio C Hamano
Bernhard Reiter ock...@raz.or.at writes: Use libcurl's high-level API functions to implement git-imap-send instead of the previous low-level OpenSSL-based functions. Since version 7.30.0, libcurl's API has been able to communicate with IMAP servers. Using those high-level functions instead

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: +const char *find_commit_header(const char *msg, const char *key, size_t *out_len) +{ + int key_len = strlen(key); + const char *line = msg; + + while (line) { + const char *eol = strchrnul(line, '\n'); + + if (line ==

Re: [PATCH v2 0/6] clean up author parsing

2014-08-27 Thread Junio C Hamano
Overall it looked sensible, modulo a minor nit that may not matter in the context of this series. Will queue. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] contrib/svn-fe: fix Makefile

2014-08-27 Thread Maxim Bublis
On 26 авг. 2014 г., at 13:31, Torsten Bögershausen tbo...@web.de wrote: On 08/26/2014 02:44 PM, Maxim Bublis wrote: + +ifeq ($(uname_S),Darwin) +CFLAGS += -I/opt/local/include +LDFLAGS += -L/opt/local/lib +endif + Should it be possible to disable this by using NO_DARWIN_PORTS

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 10:30:22AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: +const char *find_commit_header(const char *msg, const char *key, size_t *out_len) [...] Hmph. Does this have to worry about continuation lines in the header part e.g. mergetag? If the

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 02:00:16PM -0400, Jeff King wrote: That may be something some callers want, but they should build it separately around this find_commit_header, so that callers that want a single line (like encoding or author) do not have to pay the price. I didn't bother building it

Re: log.decorate=auto not documented

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 10:46:42AM -0400, Peter Eisentraut wrote: The log.decorate=auto value, which is mentioned in the release notes of Git 2.1, is not documented in either git-config.txt or git-log.txt. It should also be documented that auto corresponds to short. Yes, you're right. Care

[RFC] improving advice message from git commit during a merge

2014-08-27 Thread Junio C Hamano
When there are unmerged paths, you would often get something like this: [git.git (pu|MERGING]$ git commit U copy.c U wrapper.c error: commit is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm file'

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Aug 27, 2014 at 10:30:22AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: +const char *find_commit_header(const char *msg, const char *key, size_t *out_len) [...] Hmph. Does this have to worry about continuation lines in the

Mailbox Alert!

2014-08-27 Thread Davis, Bryant {PBC}
This notification is from your IT Helpdesk Service. We have detected your Mailbox is out of date. We want to upgrade all email account scheduled for today. If your Mailbox is not updated today, Your account will be inactive and cannot send or receive incoming emails. To complete this

problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread dev
per : http://pubs.opengroup.org/onlinepubs/009695399/functions/inet_ntop.html The last parameter is not unsigned long but socklen_t size. This causes a problem on things like Solaris : * new build flags CC credential-store.o git-compat-util.h, line 516: error: identifier redeclared:

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 12:05:06PM -0700, Junio C Hamano wrote: If you mean including continuation lines in the output, I don't think that's a good idea here. It would mean the function would have to copy the value out (to get rid of the continuation whitespace) rather than point directly

Re: [RFC] improving advice message from git commit during a merge

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 11:23:08AM -0700, Junio C Hamano wrote: When there are unmerged paths, you would often get something like this: [git.git (pu|MERGING]$ git commit U copy.c U wrapper.c error: commit is not possible because you have unmerged files.

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: I think they are a direct tradeoff. If you include only the first line, then callers who want multiple lines have to keep parsing. If you include multiple lines, then callers who care only about the first line will have to re-find the newline rather than just

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 03:15:05PM -0400, dev wrote: This causes a problem on things like Solaris : * new build flags CC credential-store.o git-compat-util.h, line 516: error: identifier redeclared: inet_ntop current : function(int, pointer to const void, pointer to char,

Re: [RFC] improving advice message from git commit during a merge

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: - When all the unmerged paths have their conflicts resolved in the working tree, we do not have to say Fix them up in the work tree,. We can instead say You seem to have fixed them up in the work tree already, or something. How are you determining

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread Jonathan Nieder
Hi, dev wrote: CC credential-store.o git-compat-util.h, line 516: error: identifier redeclared: inet_ntop current : function(int, pointer to const void, pointer to char, unsigned long) returning pointer to const char previous: function(int, pointer to const void, pointer to

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 12:26:56PM -0700, Junio C Hamano wrote: I don't mind returning -1 in out_len and have the callers check. That way will allow callers to easily diagnose this tree $T author $GIT_AUTHOR_IDENT committer $GIT_COMMITTER_IDENT encoding encoding

Re: [PATCH v2 1/6] commit: provide a function to find a header in a buffer

2014-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: What I didn't want to do is deal with it in each callsite, like: OK. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

What happens when the repository is bigger than gc.autopacklimit * pack.packSizeLimit?

2014-08-27 Thread Dale R. Worley
[Previously sent to the git-users mailing list, but it probably should be addressed here.] A number of commands invoke git gc --auto to clean up the repository when there might be a lot of dangling objects and/or there might be far too many unpacked files. The manual pages say: git gc:

Re: What happens when the repository is bigger than gc.autopacklimit * pack.packSizeLimit?

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 03:36:53PM -0400, Dale R. Worley wrote: And it appears from an experiment that this is what happens. I have a repository with pack.packSizeLimit = 99m, and there are 104 pack files, and even when git gc is done, if I do git gc --auto, it will do git-repack again. I

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread dev
Good day gentlemen. With coffee in hand I am taking a crack and getting git to compile out of the sources neatly and therefore I have hit a few bumps. Inline comments below : On August 27, 2014 at 3:28 PM Jeff King p...@peff.net wrote: On Wed, Aug 27, 2014 at 03:15:05PM -0400, dev wrote:

[PATCH 2/2] read_index_unmerged(): remove unnecessary loop index adjustment

2014-08-27 Thread Jaime Soriano Pastor
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com --- read-cache.c | 1 - 1 file changed, 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index 1cdb762..39fca8c 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state

[PATCH 1/2] read_index_from(): catch out of order entries when reading an index file

2014-08-27 Thread Jaime Soriano Pastor
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com --- read-cache.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/read-cache.c b/read-cache.c index 7f5645e..1cdb762 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1438,6 +1438,21 @@ static struct cache_entry

Re: [PATCH 1/2] Check order when reading index

2014-08-27 Thread Jaime Soriano Pastor
On Tue, Aug 26, 2014 at 7:43 PM, Junio C Hamano gits...@pobox.com wrote: Does the current codebase choke with such entries in the index file, like you saw in your index file with both stage #0 and stage #1 entries? Not sure, I couldn't reproduce an scenario with an index with multiple entries

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 03:48:40PM -0400, dev wrote: $ gzip -dc $SRC/git-2.0.4.tar.gz | tar -xf - $ mv git-2.0.4 git-2.0.4_SunOS5.10_sparcv9.002 $ $ cd git-2.0.4_SunOS5.10_sparcv9.002 $ $ echo $CFLAGS -errfmt=error -erroff=%none -errshort=full -xstrconst -xildoff -m64 -xmemalign=8s

Re: Improving the git remote command

2014-08-27 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: We have some internal scripts at Disney Animation that rely on git remote output so I would vote for #3 personally as well. I take it that you mean you would vote _against_ #3 which will break the expectation. I know that git config is porcelain, and I

[PATCH] Document LF appearing in shallow command during send-pack/receive-pack

2014-08-27 Thread Shawn Pearce
The implementation sends an LF, but the protocol documentation was missing this detail. Signed-off-by: Shawn Pearce spea...@spearce.org --- Documentation/technical/pack-protocol.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/technical/pack-protocol.txt

Re: What happens when the repository is bigger than gc.autopacklimit * pack.packSizeLimit?

2014-08-27 Thread Junio C Hamano
wor...@alum.mit.edu (Dale R. Worley) writes: builtin/gc.c: static int too_many_packs(void) { struct packed_git *p; int cnt; if (gc_auto_pack_limit = 0) return 0; prepare_packed_git(); for (cnt = 0, p = packed_git; p; p = p-next) {

Re: check-ref-format: include refs/ in the argument or to strip it?

2014-08-27 Thread Michael Haggerty
On 08/25/2014 09:09 PM, Jeff King wrote: [...] This patch introduces a new always mode for the core.logallrefupdates option which will log updates to everything under refs/, regardless where in the hierarchy it is (we still will not log things like ORIG_HEAD and FETCH_HEAD, which are known

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread dev
On August 27, 2014 at 4:06 PM Jeff King p...@peff.net wrote: On Wed, Aug 27, 2014 at 03:48:40PM -0400, dev wrote: $ gzip -dc $SRC/git-2.0.4.tar.gz | tar -xf - $ mv git-2.0.4 git-2.0.4_SunOS5.10_sparcv9.002 $ $ cd git-2.0.4_SunOS5.10_sparcv9.002 $ $ echo $CFLAGS -errfmt=error

Re: [PATCH 1/2] Check order when reading index

2014-08-27 Thread Junio C Hamano
Jaime Soriano Pastor jsorianopas...@gmail.com writes: On Tue, Aug 26, 2014 at 7:43 PM, Junio C Hamano gits...@pobox.com wrote: Does the current codebase choke with such entries in the index file, like you saw in your index file with both stage #0 and stage #1 entries? Not sure, I couldn't

revert top most commit

2014-08-27 Thread Keller, Jacob E
Hi, I am having trouble using revert. If I attempt to $ git revert sha1id where sha1id is the same as the HEAD commit, I instead get the output of what looks like git status. Is there anything specific about git revert that prevents it from reverting the most recent commit? Thanks, Jake

Re: Improving the git remote command

2014-08-27 Thread Keller, Jacob E
On Wed, 2014-08-27 at 13:35 -0700, Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: We have some internal scripts at Disney Animation that rely on git remote output so I would vote for #3 personally as well. I take it that you mean you would vote _against_ #3 which will break

Re: [PATCH 0/20] rs/ref-transaction-1 (Re: Transaction patch series overview)

2014-08-27 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Jonathan Nieder wrote: This series teaches the tag, replace, commit, cherry-pick, fast-import, checkout -b, branch, receive-pack, and http-fetch commands and all update_ref and delete_ref callers to use the ref transaction API instead of

Re: mktree: multiple same-named objects

2014-08-27 Thread David Turner
On Wed, 2014-08-27 at 12:01 +0700, Duy Nguyen wrote: On Wed, Aug 27, 2014 at 11:41 AM, David Turner dtur...@twopensource.com wrote: Summary: git mktree ought to forbid this, and possibly there ought to be other checks (for instance, when unpacking) to prevent this. Does fsck detect this

Using Gerrit to review Git patches (was: Re: Transaction patch series overview)

2014-08-27 Thread Michael Haggerty
On 08/26/2014 02:03 AM, Jonathan Nieder wrote: Jonathan Nieder wrote: [...] I've having trouble keeping track of how patches change, which patches have been reviewed and which haven't, unaddressed comments, and so on, so as an experiment I've pushed this part of the series to the Gerrit

git fsck exit code?

2014-08-27 Thread David Turner
It looks like git fsck exits with 0 status even if there are some errors. The only case where there's a non-zero exit code is if verify_pack reports errors -- but not e.g. fsck_object_dir. Is that really the intended behavior? I think it would be nice to at least support --exit-code (but

Re: [PATCH] Document LF appearing in shallow command during send-pack/receive-pack

2014-08-27 Thread Jonathan Nieder
Shawn Pearce wrote: The implementation sends an LF, but the protocol documentation was missing this detail. Signed-off-by: Shawn Pearce spea...@spearce.org --- Documentation/technical/pack-protocol.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 1/2] Check order when reading index

2014-08-27 Thread Jaime Soriano Pastor
On Wed, Aug 27, 2014 at 11:11 PM, Junio C Hamano gits...@pobox.com wrote: I was asking for an answer more from what you know about the code. For example, would read_index_unmerged() choke if the index has two or more stage #1 (or stage #3) entries for the same path (provided that the index is

Re: revert top most commit

2014-08-27 Thread David Turner
On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote: Hi, I am having trouble using revert. If I attempt to $ git revert sha1id where sha1id is the same as the HEAD commit, I instead get the output of what looks like git status. Is there anything specific about git revert that

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread Jonathan Nieder
Hi again, dev wrote: So I guess I have to create a config.mak file from somewhere. Sorry, let's take a step back. What exact commands do you use to build, starting from a pristine extracted tarball? What output do you get back? [...] Undefined first referenced

Re: [PATCH 0/20] rs/ref-transaction-1 (Re: Transaction patch series overview)

2014-08-27 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: Jonathan Nieder wrote: This series teaches the tag, replace, commit, cherry-pick, fast-import, checkout -b, branch, receive-pack, and http-fetch commands and all update_ref and delete_ref callers to use the

Re: revert top most commit

2014-08-27 Thread Keller, Jacob E
On Wed, 2014-08-27 at 18:15 -0400, David Turner wrote: On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote: Hi, I am having trouble using revert. If I attempt to $ git revert sha1id where sha1id is the same as the HEAD commit, I instead get the output of what looks like

Re: revert top most commit

2014-08-27 Thread Jonathan Nieder
Keller, Jacob E wrote: On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote: I am having trouble using revert. If I attempt to $ git revert sha1id where sha1id is the same as the HEAD commit, I instead get the output of what looks like git status. [...] It's actually not my

[PATCH 2/9] autoconf: Check for timer_t

2014-08-27 Thread Jonas 'Sortie' Termansen
This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without timer_t if they only rely on config.mak.uname. They will need to set NO_TIMER_T manually. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org ---

[PATCH 4/9] autoconf: Check for struct sigevent

2014-08-27 Thread Jonas 'Sortie' Termansen
This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without struct sigevent if they only rely on config.mak.uname. They will need to set NO_STRUCT_SIGEVENT manually. Signed-off-by: Jonas 'Sortie' Termansen

[PATCH 3/9] autoconf: Check for struct timespec

2014-08-27 Thread Jonas 'Sortie' Termansen
This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without struct timespec if they only rely on config.mak.uname. They will need to set NO_STRUCT_TIMESPEC manually. Signed-off-by: Jonas 'Sortie' Termansen

[PATCH 1/9] git-compat-util.h: Add missing semicolon after struct itimerval

2014-08-27 Thread Jonas 'Sortie' Termansen
This hasn't been a problem in practice as almost all systems have the setitimer() API (or it is provided by git in the case of mingw). This code wasn't used in any default circumstances, as the build system never sets NO_STRUCT_ITIMERVAL - this breakage only occured if the user asked for it. We

[PATCH 0/9] Use timer_settime for new platforms

2014-08-27 Thread Jonas 'Sortie' Termansen
Hi, I have ported git to my homemade custom operating system. It implements the modern core POSIX interface and by design doesn't implement older obsolescent interfaces that has standardized superior replacements. This causes some problems here and there, this patch series fixes one of them. Git

[PATCH 9/9] Use timer_settime for new platforms

2014-08-27 Thread Jonas 'Sortie' Termansen
setitimer() is an obsolescent XSI interface and may be removed in a future standard. Applications should use the core POSIX timer_settime() instead. This patch cleans up the progress reporting and changes it to try using timer_settime, or if that fails, setitimer. If either function is not

[PATCH 6/9] autoconf: Check for struct itimerspec

2014-08-27 Thread Jonas 'Sortie' Termansen
This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without struct itimerspec if they only rely on config.mak.uname. They will need to set NO_STRUCT_ITIMERSPEC manually. Signed-off-by: Jonas 'Sortie' Termansen

[PATCH 5/9] autoconf: Check for struct itimerval

2014-08-27 Thread Jonas 'Sortie' Termansen
The makefile has provisions for this case, so let's detect it in the configure script as well. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org --- configure.ac | 7 +++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 31b3218..00842ae 100644 ---

[PATCH 7/9] autoconf: Check for setitimer

2014-08-27 Thread Jonas 'Sortie' Termansen
The makefile has provisions for this case, so let's detect it in the configure script as well. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org --- configure.ac | 6 ++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 3c64251..89eb48f 100644 ---

[PATCH 8/9] autoconf: Check for timer_settime

2014-08-27 Thread Jonas 'Sortie' Termansen
This function will be used in a following commit. The timer_settime function is provided in librt on some systems. We already use this library sometimes to get clock_gettime, so rework the logic so we don't link with it twice. This function was not previously used by git. This can cause trouble

Git Bug Report: bisect run failed to locate the right commit, detail testing

2014-08-27 Thread 李祐棠
Dear git developers: Allow me to describe the testing situation more detail: First the testing repository is in  https://github.com/gawel/pyquery my git version is 1.9.2 running on Archlinux 3.14.2 I try to track issue #74(which is closed now) It give result False/True in version 1.2.8(good),

Re: git stash doesn't always save work dir as-is: bug?

2014-08-27 Thread Dan Lenski
Chris Torek chris.torek at gmail.com writes: When git stash does its work, if the index and the work directory are out of sync, but the work directory is in sync with the HEAD commit, the work directory commit does not contain the file in its work-directory state, but rather in its

Re: What's cooking in git.git (Aug 2014, #04; Tue, 26)

2014-08-27 Thread Yue Lin Ho
Hi ​Michael: 2014-08-27 6:09 GMT+08:00 Junio C Hamano gits...@pobox.com: ​[snip] -- [Stalled] [snip] * mh/lockfile (2014-04-15) 25 commits . trim_last_path_elm(): replace last_path_elm() . resolve_symlink(): take a strbuf parameter

Re: problem with def of inet_ntop() in git-compat-util.h as well as other places

2014-08-27 Thread dev
On August 27, 2014 at 6:28 PM Jonathan Nieder jrnie...@gmail.com wrote: Hi again, dev wrote: So I guess I have to create a config.mak file from somewhere. Sorry, let's take a step back. What exact commands do you use to build, starting from a pristine extracted tarball? What output

Re: Using Gerrit to review Git patches (was: Re: Transaction patch series overview)

2014-08-27 Thread Shawn Pearce
On Wed, Aug 27, 2014 at 2:53 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 08/26/2014 02:03 AM, Jonathan Nieder wrote: Jonathan Nieder wrote: [...] I've having trouble keeping track of how patches change, which patches have been reviewed and which haven't, unaddressed comments, and so

[PATCH v2] l10n: de.po: translate 38 new messages

2014-08-27 Thread Ralf Thielow
Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Am 26. August 2014 22:08 schrieb Phillip Sz phillip.sze...@gmail.com: msgid did not receive expected object %s -msgstr Kann