On Mon, Jun 30, 2014 at 03:04:19AM -0700, Gary Fixler wrote:
> I just made a new test repo, added and fetched two unrelated repos,
> and then did the log view (all/graph/decorate/oneline), and tacked on
> --boundary, but saw no change. The root commits looked the same.
There was some discussion a
On Tue, Jul 01, 2014 at 10:08:15AM -0700, Junio C Hamano wrote:
> I didn't think it through but my gut feeling is that we could change
> the name similarity score to be the length of the tail part that
> matches (e.g. 1.a to a/2.a that has the same two bytes at the tail
> is a better match than to
On 07/08/2014 10:25 PM, Ramsay Jones wrote:
On 08/07/14 20:34, Jens Lehmann wrote:
Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
On 2014-07-07 19.05, Junio C Hamano wrote:
Jens Lehmann writes:
Junio, do you want me to resend 02/14 without the non-portable "echo -n"
or could you just sq
On Wed, Jul 09, 2014 at 02:46:35PM +0900, Yi, EungJun wrote:
> I agree with you. In fact, I tried to get user's preferred language in
> the same way as gettext. It has guess_category_value() to do that and
> the function is good enough because it considers $LANGUAGE, $LC_ALL,
> $LANG, and also sys
There seems to be some other trouble under Mac OS, not yet fully tracked down,
(may be related to the "diff -r")
Torsten sees failures of this kind under Mac OS:
diff -r .git/modules/sub1/config sub1/.git/config
6d5
< worktree = ../../../sub1
8a8
worktree = ../../../sub1
So the conf
2014-07-09 14:10 GMT+09:00 Jeff King :
> On Wed, Jul 09, 2014 at 12:54:06AM +0900, Yi EungJun wrote:
>
>> From: Yi EungJun
>>
>> Add an Accept-Language header which indicates the user's preferred
>> languages defined by 'LANGUAGE' environment variable if the variable is
>> not empty.
>>
>> Example
On Tue, Jul 8, 2014 at 12:24 PM, Jens Lehmann wrote:
>
> Am 07.07.2014 20:13, schrieb Junio C Hamano:
> >
> > So I am not very enthusiastic to see this change myself.
>
> Ok, I understand we do not want to lightly risk false positives. I
> just noticed that I accidentally forgot to sign off this s
On Sat, Jul 05, 2014 at 12:42:29AM +0200, Karsten Blees wrote:
> Note: this fix just 'abuses' strbuf as string allocator, len is always 0.
> prep_exclude() can probably be simplified using more strbuf APIs.
Hrm. It looks like you grow it and add some data, but really don't want
the length to expa
On Mon, Jul 07, 2014 at 11:13:11AM -0700, Junio C Hamano wrote:
> Jens Lehmann writes:
>
> > Only the two targets "test-lint-duplicates" and "test-lint-executable" are
> > currently executed when running the test target. This was done on purpose
> > when the TEST_LINT variable was added in 81127
On Mon, Jul 07, 2014 at 09:54:55PM -0700, Jeremy Apthorp wrote:
> I write this missive with dual purpose: firstly to share a potentially
> useful tool, and secondly to suggest that this feature (with a less
> mind-wrenchingly disgusting implementation) might be included in
> mainline git, as for e
On Wed, Jul 09, 2014 at 12:54:06AM +0900, Yi EungJun wrote:
> From: Yi EungJun
>
> Add an Accept-Language header which indicates the user's preferred
> languages defined by 'LANGUAGE' environment variable if the variable is
> not empty.
>
> Example:
> LANGUAGE= -> ""
> LANGUAGE=ko -> "Accep
On Tue, Jul 08, 2014 at 11:48:06AM -0700, Junio C Hamano wrote:
> I'd say that "if you have foo/bar you cannot have foo" may have
> started as an implementation limitation, but the interoperability
> requirement with existing versions of Git and with existing
> repositories makes it necessary to e
The git log --graph --show-signature command incorrectly indents the gpg
information about signed commits and merged signed tags. It does not
follow the level of indentation of the current commit.
Example of garbled output:
$ git log --show-signature --graph
* commit 258e0a237cb69aaa587b0a4fb528
On Wed, Jul 9, 2014 at 12:05 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> I wonder if we need to update_main_cache_tree() so many times in this
>> function. If I read the code correctly, all roads must lead to
>> update_main_cache_tree(0) in prepare_to_commit().
>
> I think prepare-to-comm
On Wed, 2014-07-09 at 02:52 +0200, Øyvind A. Holm wrote:
> On 3 July 2014 23:55, Øyvind A. Holm wrote:
> > When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5
> > (64-bit), t5150-request-pull.sh fails when compiling with
> >
> > $ make configure
> > $ ./configure --prefix=/usr/local/v
On 3 July 2014 23:55, Øyvind A. Holm wrote:
> When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5
> (64-bit), t5150-request-pull.sh fails when compiling with
>
> $ make configure
> $ ./configure --prefix=/usr/local/varprg/git.master.v2.0.1-472-g6f92e5f
> $ make prefix=/usr/local/varpr
Fabian Ruch writes:
> The command line used to recreate root commits specifies the
> effectless option `-C`. It is used to reuse commit message and
> authorship from the named commit but the commit being amended here,
> which is the sentinel commit, already carries the authorship and log
> messag
Fabian Ruch writes:
> The command line used to recreate root commits specifies the
> erroneous option `-q` which suppresses the commit summary message.
> However, git-rebase--interactive tends to tell the user about the
> commits it creates, if she wishes (cf. command line option
> `--verbose`).
Fabian Ruch 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 like for any other commit that is on the
> to-
On Tue, Jul 8, 2014 at 11:54 AM, Yi EungJun wrote:
> From: Yi EungJun
>
> Add an Accept-Language header which indicates the user's preferred
> languages defined by 'LANGUAGE' environment variable if the variable is
> not empty.
>
> Example:
> LANGUAGE= -> ""
> LANGUAGE=ko -> "Accept-Language:
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-publi
On Tue, Jul 8, 2014 at 7:12 AM, Zoltan Klinger wrote:
> The git log --graph --show-signature command incorrectly indents the gpg
> information about signed commits and merged signed tags. It does not
> follow the level of indentation of the current commit.
>
> Reported-by: Jason Pyeron
> Signed-o
On 08/07/14 21:25, Ramsay Jones wrote:
> On 08/07/14 20:34, Jens Lehmann wrote:
>> Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
>>> On 2014-07-07 19.05, Junio C Hamano wrote:
Jens Lehmann writes:
> Junio, do you want me to resend 02/14 without the non-portable "echo -n"
> o
Fabian Ruch writes:
> Fabian Ruch (19):
> rebase -i: Failed reword prints redundant error message
> rebase -i: reword complains about empty commit despite --keep-empty
> rebase -i: reword executes pre-commit hook on interim commit
> rebase -i: Teach do_pick the option --edit
> rebase -i
Signed-off-by: Max Kirillov
---
Hi.
I was missing this one. Actually the most needed is go to first
parent, though the second also may be useful.
gitk | 12
1 file changed, 12 insertions(+)
diff --git a/gitk b/gitk
index 41e5071..de35fe4 100755
--- a/gitk
+++ b/gitk
@@ -2594,6 +259
Fabian Ruch writes:
> The to-do list command `reword` replays a commit like `pick` but lets
> the user also edit the commit's log message. This happens in two
> steps. Firstly, the named commit is cherry-picked. Secondly, the
> commit created in the first step is amended using an unchanged index
Fabian Ruch writes:
> Subject: rebase -i: reword complains about empty commit despite --keep-empty
I had to read the title and then the log twice before understanding
that the above is not "change the complaint message" (i.e. "reword
complaints" spelled incorrectly) but is a description of the c
Fabian Ruch writes:
> The to-do list command `reword` replays a commit like `pick` but lets
> the user also edit the commit's log message. If the edited log
> message is empty or is found ill-formatted by one of the commit
> hooks, git-rebase--interactive prints three error messages to the
> cons
On 08/07/14 20:34, Jens Lehmann wrote:
> Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
>> On 2014-07-07 19.05, Junio C Hamano wrote:
>>> Jens Lehmann writes:
>>>
Junio, do you want me to resend 02/14 without the non-portable "echo -n"
or could you just squash the following diff in?
Heiko Voigt writes:
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 07cf555..03ea20d 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -18,6 +18,7 @@
> #include "xdiff-interface.h"
> #include "ll-merge.h"
> #include "resolve-undo.h"
> +#include "submodule-config.
Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
> On 2014-07-07 19.05, Junio C Hamano wrote:
>> Jens Lehmann writes:
>>
>>> Junio, do you want me to resend 02/14 without the non-portable "echo -n"
>>> or could you just squash the following diff in?
>>
>> Amended locally here already; thanks, bo
Am 07.07.2014 20:13, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Only the two targets "test-lint-duplicates" and "test-lint-executable" are
>> currently executed when running the test target. This was done on purpose
>> when the TEST_LINT variable was added in 81127d74. But as this does n
Duy Nguyen writes:
> Writing cache tree early in prepare_index() does help hooks, but I
> would say hooks are uncommon case and we could add an option to
> update-index to explicitly rebuild cache-tree, then hooks that do diff
> a lot (or other operations that use cache-tree) could rebuild
> cach
Michael Haggerty writes:
> Patches 01-19 -- ACK mhagger
> Patches 20-42 -- I sent various comments, small to large, concerning
> these patches
> Patch 43 -- Needs more justification if it is to be acceptable
> Patch 44 -- Depends on 43
> Patches 45-48 -- I didn't quite get to these, but...
>
> Pe
Duy Nguyen writes:
> ... I know the
> "index_file" in prepare_to_commit() is probably "index.lock" or
> something, but that does not stop us from locking again
> ("index.lock.lock") if we want to update it.
We grabbed the lock on the real index and we have written out the
result of "update-index
David Turner writes:
> @@ -16,8 +16,26 @@ cmp_cache_tree () {
> # We don't bother with actually checking the SHA1:
> # test-dump-cache-tree already verifies that all existing data is
> # correct.
> -test_shallow_cache_tree () {
> - printf "SHA (%d entries, 0 subtrees)\n" $(git ls-files|wc
David Turner writes:
> + printf "invalid %s ()\n" "" "$@"
> >expect &&
> + test-dump-cache-tree | \
> + sed -n -e "s/$_x40/SHA/" -e "s/[0-9]* subtrees//g" -e '/#(ref)/d' -e
> '/^invalid /p' >actual &&
You only show lines that begin with "invalid ".
Duy Nguyen writes:
> I wonder if we need to update_main_cache_tree() so many times in this
> function. If I read the code correctly, all roads must lead to
> update_main_cache_tree(0) in prepare_to_commit().
I think prepare-to-commit is too late; it does not want to know if
the index it was give
On 06/20/2014 04:42 PM, Ronnie Sahlberg wrote:
> This patch series can also be found at
> https://github.com/rsahlberg/git/tree/ref-transactions
>
> This patch series is based on current master and expands on the transaction
> API. It converts all ref updates, inside refs.c as well as external, to
Signed-off-by: Rene Scharfe
---
line-log.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/line-log.c b/line-log.c
index 1500101..afcc98d 100644
--- a/line-log.c
+++ b/line-log.c
@@ -1174,9 +1174,7 @@ static int process_ranges_merge_commit(struct rev_info
*rev, struct comm
Signed-off-by: Rene Scharfe
---
builtin/diff-tree.c | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index be6417d..ce0e019 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -22,14 +22,10 @@ static int stdin_diff_com
From: Yi EungJun
Add an Accept-Language header which indicates the user's preferred
languages defined by 'LANGUAGE' environment variable if the variable is
not empty.
Example:
LANGUAGE= -> ""
LANGUAGE=ko -> "Accept-Language: ko; q=1.000, *; q=0.001"
LANGUAGE=ko:en -> "Accept-Language: ko;
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic
> directly from the commit function.
This commit is obviously hostage to whether commit 43/48 is kept.
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Ronnie Sahlberg
> -
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Move the check for check_refname_format from lock_any_ref_for_update
> to lock_ref_sha1_basic. At some later stage we will get rid of
> lock_any_ref_for_update completely.
>
> If lock_ref_sha1_basic fails the check_refname_format test, set errno to
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Change the reference transactions so that we pass the reflog message
> through to the create/delete/update function instead of the commit message.
> This allows for individual messages for each change in a multi ref
> transaction.
>
> Reviewed-by: J
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Add an err argument to delete_loose_ref so that we can pass a descriptive
> error string back to the caller. Pass the err argument from transaction
> commit to this function so that transaction users will have a nice error
> string if the transaction
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Change delete_ref to use a ref transaction for the deletion. At the same time
> since we no longer have any callers of repack_without_ref we can now delete
> this function.
>
> Change delete_ref to return 0 on success and 1 on failure instead of the
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> lock_ref_sha1 was only called from one place in refc.c and only provided
> a check that the refname was sane before adding back the initial "refs/"
> part of the ref path name, the initial "refs/" that this caller had already
> stripped off before ca
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Switch to using ref transactions in walker_fetch(). As part of the refactoring
> to use ref transactions we also fix a potential memory leak where in the
> original code if write_ref_sha1() would fail we would end up returning from
> the function wit
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Wrap all the ref updates inside a transaction.
>
> Signed-off-by: Ronnie Sahlberg
> ---
> builtin/receive-pack.c | 96
> +-
> 1 file changed, 63 insertions(+), 33 deletions(-)
>
> diff --git a/buil
The get_pathname function does not really return path name but rather
a buffer to store pathname in. As such, current name is a bit
confusing. Change the name as to make it clearer what the function is
doing.
Signed-off-by: Michal Nazarewicz
---
path.c | 8
1 file changed, 4 insertion
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Change the update_ref helper function to use a ref transaction internally.
>
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Ronnie Sahlberg
> ---
> refs.c | 28
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
>
The get_pathname function does not really return path name but rather
a buffer to store pathname in. As such, current name is a bit
confusing. Change the name as to make it clearer what the function is
doing.
Signed-off-by: Michal Nazarewicz
---
path.c | 8
1 file changed, 4 insertion
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Update replace.c to use ref transactions for updates.
>
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Ronnie Sahlberg
> ---
> builtin/replace.c | 15 +--
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/re
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Change tag.c to use ref transactions for all ref updates.
>
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Ronnie Sahlberg
> ---
> builtin/tag.c | 15 +--
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/ta
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Change to use ref transactions for all updates to refs.
>
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Ronnie Sahlberg
> ---
> sequencer.c | 24
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/sequ
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Track the status of a transaction in a new status field. Check the field for
The status field is not set or used anywhere. The field that you use is
"state".
> sanity, i.e. that status must be OPEN when _commit/_create/_delete or
> _update is call
I'm in my next attempt to get through your patch series. Sorry for the
long hiatus.
Patches 1-19 look OK aside from a minor typo that I just reported.
See below for a comment on this patch.
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Do basic error checking in ref_transaction_create() and
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Add an err argument to _begin so that on non-fatal failures in future ref
> backends we can report a nice error back to the caller.
> While _begin can currently never fail for other reasons than OOM, in which
> case we die() anyway, we may add other
On 06/20/2014 04:42 PM, Ronnie Sahlberg wrote:
> Making errno when returning from lock_file() meaningful, which should
> fix
>
> * an existing almost-bug in lock_ref_sha1_basic where it assumes
>errno==ENOENT is meaningful and could waste some work on retries
>
> * an existing bug in repack
The git log --graph --show-signature command incorrectly indents the gpg
information about signed commits and merged signed tags. It does not
follow the level of indentation of the current commit.
Example of garbled output:
$ git log --show-signature --graph
* commit 258e0a237cb69aaa587b0a4fb528
On Tue, Jul 8, 2014 at 7:26 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>>> diff --git a/builtin/commit.c b/builtin/commit.c
>>> index 9cfef6c..5981755 100644
>>> --- a/builtin/commit.c
>>> +++ b/builtin/commit.c
>>> @@ -342,6 +342,8 @@ static char *prepare_index(int argc, const char **a
62 matches
Mail list logo
