Re: [PATCH 2/4] receive-pack: implement advertising and receiving push options

2016-07-11 Thread Jeff King
On Sun, Jul 10, 2016 at 10:06:12AM -0700, Shawn Pearce wrote: > On Fri, Jul 8, 2016 at 5:31 PM, Stefan Beller wrote: > > + > > + /* NEEDSWORK: expose the limitations to be configurable. */ > > + int max_options = 32; > > + > > + /* > > +* NEEDSWORK:

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Jeff King
On Mon, Jul 11, 2016 at 06:59:51PM -0700, Junio C Hamano wrote: > > diff --git a/help.c b/help.c > > index 19328ea..0cea240 100644 > > --- a/help.c > > +++ b/help.c > > @@ -419,6 +419,13 @@ int cmd_version(int argc, const char **argv, const > > char *prefix) > > * with external projects

Re: [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge

2016-07-11 Thread Torsten Bögershausen
How do things look at this point? This version is what I ended up queuing in 'pu', but I took your "Thanks" in $gmane/299120 to only mean "Thanks for feeding some ideas to help me move forward", not necessarily "Tnanks that looks like the right approach." yet, so right now both topics are

Re: [PATCH] difftool: fix argument handling in subdirs

2016-07-11 Thread David Aguilar
[Cc'd Tim, who originally authored the dir-diff code] On Tue, Jul 05, 2016 at 08:52:52PM +0100, John Keeping wrote: > On Mon, Jul 04, 2016 at 08:37:39PM +0200, Bernhard Kirchen wrote: > > Today I started using --dir-diff and noticed a problem when specifying a > > non-full path limiter. My diff

Re: [PATCH 3/5] doc/pretty-formats: describe index/time formats for %gd

2016-07-11 Thread Junio C Hamano
Jeff King writes: > Maybe this on top of the other documentation patches? > > -- >8 -- > Subject: [PATCH] doc/pretty-formats: explain shortening of %gd > > The actual shortening rules aren't that interesting and > probably not worth getting into (I gloss over them here as >

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Junio C Hamano
Jeff King writes: > On Mon, Jul 11, 2016 at 11:35:05PM +0200, Andreas Schwab wrote: > >> Junio C Hamano writes: >> >> > local_tzoffset: detect errors from tm_to_time_t >> >> not ok 19 - show date (iso:5758122296 -0400) >> # >> #

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Jeff King
On Tue, Jul 12, 2016 at 12:56:11AM +, Eric Wong wrote: > Jeff King wrote: > > Otherwise, we'll have to skip the test, perhaps with something like the > > patch below. I suspect the problem is actually the size of "unsigned > > long", not time_t, as we use that internally for a

verbose fetches not overly verbose

2016-07-11 Thread Stefan Beller
$ git clone https://github.com/gitster/git tmpgit2 -v -v -v Cloning into 'tmpgit2'... Server supports multi_ack_detailed Server supports no-done Server supports side-band-64k Server supports ofs-delta Server version is

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Eric Wong
Jeff King wrote: > Otherwise, we'll have to skip the test, perhaps with something like the > patch below. I suspect the problem is actually the size of "unsigned > long", not time_t, as we use that internally for a bunch of time > computation. We should probably be using int64_t

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Anders Kaseorg
On 07/11/2016 07:54 PM, Jeff King wrote: Yes, that's somewhat the point of the test. How does it fail for you (what does it look like with "-v")? We may be able to check for an outcome that matches both cases. On Ubuntu i386 and Ubuntu armhf, I get the following verbose output from

Re: [PATCH 4/5] date: document and test "raw-local" mode

2016-07-11 Thread Jeff King
On Mon, Jul 11, 2016 at 12:50:00PM -0400, Theodore Ts'o wrote: > On Mon, Jul 11, 2016 at 01:06:17AM -0400, Jeff King wrote: > > > > The documentation claims that "raw-local" does not work. It > > does, but the end result is rather subtle. Let's describe it > > in better detail, and test to make

Re: [PATCH 3/5] doc/pretty-formats: describe index/time formats for %gd

2016-07-11 Thread Jeff King
On Mon, Jul 11, 2016 at 12:48:34PM -0400, Theodore Ts'o wrote: > On Mon, Jul 11, 2016 at 01:05:13AM -0400, Jeff King wrote: > > The "reflog selector" format changes based on a series of > > heuristics, and that applies equally to both stock "log -g" > > output, as well as "--format=%gd". The

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Jeff King
On Mon, Jul 11, 2016 at 11:35:05PM +0200, Andreas Schwab wrote: > Junio C Hamano writes: > > > local_tzoffset: detect errors from tm_to_time_t > > not ok 19 - show date (iso:5758122296 -0400) > # > # echo "$time -> $expect" >expect && > #

[PATCH v5 4/8] use smudgeToFile in git checkout etc

2016-07-11 Thread Joey Hess
This makes git checkout, git reset, etc use smudgeToFile. Includes test cases. (There's a call to convert_to_working_tree in merge-recursive.c that could also be made to use smudgeToFile as well.) Signed-off-by: Joey Hess --- entry.c | 40

[PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu)

2016-07-11 Thread Joey Hess
Back from vacation with a reroll of jh/clean-smudge-annex. Deals with conflicting changes from cc/apply-am in pu. Since tb/convert-peek-in-index is not currently in pu, this reroll isn't based on it, and will conflict if that topic gets added back into pu. Not sure what the status of

[PATCH v5 2/8] add smudgeToFile and cleanFromFile filter configs

2016-07-11 Thread Joey Hess
This adds new smudgeToFile and cleanFromFile filter commands, which are similar to smudge and clean but allow direct access to files on disk. This interface can be much more efficient when operating on large files, because the whole file content does not need to be streamed through the filter. It

[PATCH v5 7/8] use smudgeToFile filter in git am

2016-07-11 Thread Joey Hess
git am updates the work tree and so should use the smudgeToFile filter. This includes some refactoring into convert_to_working_tree_filter_to_file to make it check the file after running the smudgeToFile command, and clean up from a failing command. Signed-off-by: Joey Hess

[PATCH v5 6/8] better recovery from failure of smudgeToFile filter

2016-07-11 Thread Joey Hess
If the smudgeToFile filter fails, it can leave the worktree file with the wrong content, or even deleted. Recover from this by falling back to running the smudge filter. Signed-off-by: Joey Hess --- entry.c | 66 ++-

[PATCH v5 1/8] clarify %f documentation

2016-07-11 Thread Joey Hess
It's natural to expect %f to be an actual file on disk; help avoid that mistake. Signed-off-by: Joey Hess --- Documentation/gitattributes.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index

[PATCH v5 5/8] warn on unusable smudgeToFile/cleanFromFile config

2016-07-11 Thread Joey Hess
Let the user know when they have a smudgeToFile/cleanFromFile config that cannot be used because the corresponding smudge/clean config is missing. The warning is only displayed a maximum of once per git invocation, and only when doing an operation that would use the filter. Signed-off-by: Joey

[PATCH v5 8/8] use smudgeToFile filter in recursive merge

2016-07-11 Thread Joey Hess
Recursive merge updates the work tree and so should use the smudgeToFile filter. At this point, smudgeToFile is run by everything that updates work tree files. Signed-off-by: Joey Hess --- merge-recursive.c | 53 ---

[PATCH v5 3/8] use cleanFromFile in git add

2016-07-11 Thread Joey Hess
Includes test cases. Signed-off-by: Joey Hess --- sha1_file.c | 42 -- t/t0021-conversion.sh | 36 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Andreas Schwab
Junio C Hamano writes: > local_tzoffset: detect errors from tm_to_time_t not ok 19 - show date (iso:5758122296 -0400) # # echo "$time -> $expect" >expect && # test-date show:$format "$time" >actual && #

[REJECT 4/3] http-walker: use hashmap to reduce list scan

2016-07-11 Thread Eric Wong
For the sake of documentation, I worked on this patch but I don't there was a measurable improvement (hard to tell with variable network conditions) and it increased memory usage to around 380M. I wanted to reduce the list scanning in fill_active_slot() by deleting during iteration, but I'm not

[RFC 0/3] dumb HTTP transport speedups

2016-07-11 Thread Eric Wong
TL;DR: dumb HTTP clone from a certain badly-packed repo goes from ~2 hours to ~30 min memory usage drops from 2G to 360M I hadn't packed the public repo at https://public-inbox.org/git for a few weeks. As an admin of a small server limited memory and CPU resources but fairly good bandwidth, I

[PATCH 1/3] http-walker: remove unused parameter from fetch_object

2016-07-11 Thread Eric Wong
This parameter has not been used since commit 1d389ab65dc6 ("Add support for parallel HTTP transfers") back in 2005 Signed-off-by: Eric Wong --- http-walker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-walker.c b/http-walker.c index

[PATCH 3/3] http-walker: reduce O(n) ops with doubly-linked list

2016-07-11 Thread Eric Wong
Using the a Linux-kernel-derived doubly-linked list implementation from the Userspace RCU library allows us to enqueue and delete items from the object request queue in constant time. This change reduces enqueue times in the prefetch() function where object request queue could grow to several

[PATCH 2/3] http: avoid disconnecting on 404s for loose objects

2016-07-11 Thread Eric Wong
404s are common when fetching loose objects on static HTTP servers, and reestablishing a connection for every single 404 adds additional latency. Signed-off-by: Eric Wong --- http-walker.c | 9 + http.c| 16 ++-- 2 files changed, 23 insertions(+), 2

[PATCH v3 3/8] doc: show the actual left, right, and boundary marks

2016-07-11 Thread Philip Oakley
Signed-off-by: Philip Oakley --- Found while checking the 'symmetric difference' documentation --- Documentation/pretty-formats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index

[PATCH v3 8/8] doc: revisions - clarify reachability examples

2016-07-11 Thread Philip Oakley
For the r1..r2 case, the exclusion of r1, rather than inclusion of r2, would be the unexpected case in natural language for a simple linear development, i.e. start..end excludes start. Signed-off-by: Philip Oakley --- Documentation/revisions.txt | 11 ++- 1 file

[PATCH v3 2/8] doc: revisions - name the Left and Right sides

2016-07-11 Thread Philip Oakley
The terms Left and Right side originate from the symmetric difference. Name them there. --- Documentation/revisions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 19314e3..79f6d03 100644 ---

[PATCH v3 1/8] doc: use 'symmetric difference' consistently

2016-07-11 Thread Philip Oakley
Signed-off-by: Philip Oakley --- Documentation/gitk.txt | 2 +- Documentation/rev-list-options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 6ade002..6c3eb15 100644 ---

[PATCH v3 5/8] doc: gitrevisions - use 'reachable' in page description

2016-07-11 Thread Philip Oakley
Signed-off-by: Philip Oakley --- Documentation/gitrevisions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt index e903eb7..33039c6 100644 --- a/Documentation/gitrevisions.txt +++

[PATCH v3 7/8] doc: revisions - define `reachable`

2016-07-11 Thread Philip Oakley
Do not self-define `reachable`, which can lead to misunderstanding. Instead define `reachability` explictly. Signed-off-by: Philip Oakley --- Documentation/revisions.txt | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git

[PATCH v3 6/8] doc: gitrevisions - clarify 'latter case' is revision walk

2016-07-11 Thread Philip Oakley
The prior sentence has too many clauses for easy parsing. Replace 'the latter case' with a direct quote. Signed-off-by: Philip Oakley --- Documentation/gitrevisions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitrevisions.txt

[PATCH v3 4/8] doc: give headings for the two and three dot notations

2016-07-11 Thread Philip Oakley
While there, also break out the other shorthand notations and add a title for the revision range summary (which also appears in git-rev-parse, so keep it mixed case). Signed-off-by: Philip Oakley --- Documentation/revisions.txt | 23 +-- 1 file changed,

[PATCH v3 0/8] Name for A..B ranges?

2016-07-11 Thread Philip Oakley
This is the re-roll of the po/range-doc (2016-07-01) 3 commits and its follow on patch. The series has gained additional patches following the discussions ($gmane/298790). The original first 3 patches are unchanged, though 2/8 has been inserted to name the Left and Right ranges. The extra four

[ANNOUNCE] Git v2.9.1

2016-07-11 Thread Junio C Hamano
The latest maintenance release Git v2.9.1 is now available at the usual places. This release includes fixes to two bugs that have been reported on the list recently, among other changes: - v2.9.0 changed cloning of submodules in a top-level superproject that was cloned shallowly to

A note from the maintainer

2016-07-11 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

What's cooking in git.git (Jul 2016, #04; Mon, 11)

2016-07-11 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The first maintenance release for

Re: [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge

2016-07-11 Thread Junio C Hamano
Junio C Hamano writes: > Subject: [PATCH] merge: avoid "safer crlf" during recording of merge results > ... > We can work this around by not refreshing the new cache entry in > make_cache_entry() called by add_cacheinfo(). After add_cacheinfo() > adds the new entry, we can

Re: [PATCH v4 2/6] t6030: explicitly test for bisection cleanup

2016-07-11 Thread Junio C Hamano
Pranit Bauva writes: > Add test to explicitly check that 'git bisect reset' is working as > expected. This is already covered implicitly by the test suite. Without fuzzy "this is not an improvement but it helps" that sounds like making excuse, the above reads much

Re: [PATCH v4 0/6] convert various shell functions in git-bisect to C

2016-07-11 Thread Junio C Hamano
Pranit Bauva writes: > Some minor nits. Previous version can be found here[1]. > > [1]: http://thread.gmane.org/gmane.comp.version-control.git/298263 > > The inter-diff is : > ... > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > ... > Pranit Bauva (6):

Legit Offer

2016-07-11 Thread Joelle Bisbau
Are You In Need Of A Legit Loan?Email Back To Apply Now -- 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] pretty: add format specifiers: %gr, %gt, %gI, gi

2016-07-11 Thread Junio C Hamano
Theodore Ts'o writes: >> I'm on the fence, so I'll let you decide how you want to proceed. I can >> live with "%gr" and "%gt", as they are at least symmetric with their >> author/committer counterparts. > > I'm on the fence myself. I can live with either, since either way the >

Re: [PATCH 2/2] diff: fix a double off-by-one with --ignore-space-at-eol

2016-07-11 Thread Junio C Hamano
Johannes Schindelin writes: > diff --git a/xdiff/xutils.c b/xdiff/xutils.c > index 62cb23d..027192a 100644 > --- a/xdiff/xutils.c > +++ b/xdiff/xutils.c > @@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char > *l2, long s2, long flags) >

Re: gc and repack ignore .git/*HEAD when checking reachability

2016-07-11 Thread Junio C Hamano
Johannes Schindelin writes: >> No, the point is, refs subsystem needs to know which refs is per-repo, >> which is per-worktree. So far the rules are "everything under refs, >> except a few known exceptions, is per-repo" and "everything directly >> under $GIT_DIR is

Re: [PATCH] config.mak.uname: define NEEDS_LIBRT under Linux, for now

2016-07-11 Thread Junio C Hamano
"brian m. carlson" writes: > On Sun, Jul 10, 2016 at 10:16:44PM +, Eric Wong wrote: >> My Debian wheezy LTS system is still on glibc 2.13; and LTS >> distros may use older glibc, still, so lets not unnecessarily >> break things out-of-the-box. >> >> We seem to

Re: [PATCH 3/4] push: accept push options

2016-07-11 Thread Junio C Hamano
Stefan Beller writes: > This is not what I had in mind, but rather the pain of dealing with multi line > environment variables. Hmph, is that painful? $ cmd "$VAR" inside double quotes would do multi-line just fine, I think. But I think it is OK (and probably

Re: [RFC/PATCH 8/8] read-cache: unlink old sharedindex files

2016-07-11 Thread Duy Nguyen
On Mon, Jul 11, 2016 at 7:22 PM, Christian Couder wrote: > Everytime split index is turned on, it creates a "sharedindex." > file in the git directory. This makes sure that old sharedindex > files are removed after a new one has been created. Hmm it's one-way

[PATCH] Speed up sparse checkout when $GIT_DIR/info/sparse-checkout is unchanged

2016-07-11 Thread Nguyễn Thái Ngọc Duy
When a "tree unpacking" operation is needed, which is part of switching branches using "git checkout", the following happens in a sparse checkout: 1) Run all existing entries through $GIT_DIR/info/sparse-checkout, mark entries that are to-be-excluded or to-be-included. 2) Do n-way merge stuff

Re: Commits are no longer gpg-signed in 2.9.0 when "commit.gpgsign" is enabled

2016-07-11 Thread Junio C Hamano
On Mon, Jul 11, 2016 at 9:27 AM, Nils Fenner wrote: > Hi Santiago, > > repeated your test here and actually found something interesting. When > committing via 'git gui', commits are not being gpg-signed, while firing > a 'git commit' shows the passphrase dialog and signs the

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

2016-07-11 Thread Junio C Hamano
Eric Wong writes: > The following changes since commit cf4c2cfe52be5bd973a4838f73a35d3959ce2f43: > > Second batch of topics for 2.10 (2016-06-27 10:07:08 -0700) > > are available in the git repository at: > > git://bogomips.org/git-svn.git master > > for you to fetch changes

[RFC/PATCH 8/8] read-cache: unlink old sharedindex files

2016-07-11 Thread Christian Couder
Everytime split index is turned on, it creates a "sharedindex." file in the git directory. This makes sure that old sharedindex files are removed after a new one has been created. Signed-off-by: Christian Couder --- read-cache.c | 27

[RFC/PATCH 4/8] update-index: warn in case of split-index incoherency

2016-07-11 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/update-index.c | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index f06fe80..2b8aaa6 100644 --- a/builtin/update-index.c +++

[RFC/PATCH 1/8] config: add git_config_get_split_index()

2016-07-11 Thread Christian Couder
Signed-off-by: Christian Couder --- cache.h | 1 + config.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index f1dc289..5296a50 100644 --- a/cache.h +++ b/cache.h @@ -1695,6 +1695,7 @@ extern int git_config_get_bool_or_int(const

[RFC/PATCH 7/8] t1700: add tests for core.splitIndex

2016-07-11 Thread Christian Couder
Signed-off-by: Christian Couder --- t/t1700-split-index.sh | 37 + 1 file changed, 37 insertions(+) diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 8aef49f..f1af0d5 100755 --- a/t/t1700-split-index.sh +++

[RFC/PATCH 6/8] Documentation/git-update-index: talk about core.splitIndex config var

2016-07-11 Thread Christian Couder
Signed-off-by: Christian Couder --- Documentation/git-update-index.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index c6cbed1..2293140 100644 ---

[RFC/PATCH 5/8] Documentation/config: add information for core.splitIndex

2016-07-11 Thread Christian Couder
Signed-off-by: Christian Couder --- Documentation/config.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index e208af1..aec8ecb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -324,6

[RFC/PATCH 3/8] read-cache: add and then use tweak_split_index()

2016-07-11 Thread Christian Couder
This will make us use the split-index feature or not depending on the value of the core.splitIndex config variable. Signed-off-by: Christian Couder --- read-cache.c | 17 + 1 file changed, 17 insertions(+) diff --git a/read-cache.c b/read-cache.c index

[RFC/PATCH 0/8] Add configuration options for split-index

2016-07-11 Thread Christian Couder
Goal We want to make it possible to use the split-index feature automatically by just setting a new "core.splitIndex" configuration variable to true. This can be valuable as split-index can help significantly speed up `git rebase` especially along with the current work to libify `git

[RFC/PATCH 2/8] split-index: add {add,remove}_split_index() functions

2016-07-11 Thread Christian Couder
Also use the functions in cmd_update_index() in builtin/update-index.c. Signed-off-by: Christian Couder --- builtin/update-index.c | 17 - split-index.c | 18 ++ split-index.h | 2 ++ 3 files changed, 24 insertions(+),

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

2016-07-11 Thread Junio C Hamano
Johannes Schindelin writes: > What about the am-call-merge-recursive-directly patch series? As I > demonstrated by rebasing it to `pu`, it is actually not butchering the > smudge/clean pathway as you suggested. What I said was it seemed to conflict with something

git push doesn't update the status with multiple remotes

2016-07-11 Thread Garoe
Hello, I'm using git 1.9.1 in Ubuntu 14.04. I have a repository on github, a clone on my desktop and bare repo on a private server, in my desktop the remotes looks like this all g...@github.com:user/repo.git (fetch) all g...@github.com:user/repo.git (push) all

Re: Commits are no longer gpg-signed in 2.9.0 when "commit.gpgsign" is enabled

2016-07-11 Thread Santiago Torres
On Mon, Jul 11, 2016 at 06:27:57PM +0200, Nils Fenner wrote: > Hi Santiago, > > repeated your test here and actually found something interesting. When > committing via 'git gui', commits are not being gpg-signed, while firing > a 'git commit' shows the passphrase dialog and signs the commit

Re: [PATCH 4/5] date: document and test "raw-local" mode

2016-07-11 Thread Theodore Ts'o
On Mon, Jul 11, 2016 at 01:06:17AM -0400, Jeff King wrote: > > The documentation claims that "raw-local" does not work. It > does, but the end result is rather subtle. Let's describe it > in better detail, and test to make sure it works (namely, > the epoch time doesn't change, but the zone

Re: [PATCH 3/5] doc/pretty-formats: describe index/time formats for %gd

2016-07-11 Thread Theodore Ts'o
On Mon, Jul 11, 2016 at 01:05:13AM -0400, Jeff King wrote: > The "reflog selector" format changes based on a series of > heuristics, and that applies equally to both stock "log -g" > output, as well as "--format=%gd". The documentation for > "%gd" doesn't cover this. Let's mention the multiple

Re: [PATCH] pretty: add format specifiers: %gr, %gt, %gI, gi

2016-07-11 Thread Theodore Ts'o
On Mon, Jul 11, 2016 at 01:02:02AM -0400, Jeff King wrote: > Yeah, I'd have hoped for %gd, as well. One thing I think we should move > towards in the long run is giving more readable names to our > placeholders for git-log, the way for-each-ref and cat-file do (but > keeping the existing ones for

Re;

2016-07-11 Thread Joelle Bisbau
Your Package Delivery From UPS COURIER Email Back For More Info -- 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: Commits are no longer gpg-signed in 2.9.0 when "commit.gpgsign" is enabled

2016-07-11 Thread Nils Fenner
Hi Santiago, repeated your test here and actually found something interesting. When committing via 'git gui', commits are not being gpg-signed, while firing a 'git commit' shows the passphrase dialog and signs the commit correctly. Here's what I did: git init gpg-signing-test && cd

Re: [PATCH] Fix running tests with --valgrind

2016-07-11 Thread Duy Nguyen
On Mon, Jul 11, 2016 at 1:45 PM, Johannes Schindelin wrote: > We forgot to adjust this code path after moving the test helpers to > t/helper/. Oops. Yet it looks like the right thing to do. > > Signed-off-by: Johannes Schindelin > --- >

Re: Commits are no longer gpg-signed in 2.9.0 when "commit.gpgsign" is enabled

2016-07-11 Thread Santiago Torres
Hi Nils, I just checked and I have commits made in 2.9 with this option set and I don't seem to have your issue. Here's what I did: santiago at ~/test-signing ✔ git init Initialized empty Git repository in /home/santiago/test-signing/.git/ santiago at ~/test-signing ✔ hub create

[PATCH] mingw: fix the shortlog --output= test

2016-07-11 Thread Johannes Schindelin
Adjust t4201 to pass on Windows; a couple of test cases need to be skipped on Windows which leads to a different shortlog than on Linux. Let's just fix that by limiting the shortlog's commit range to traverse only one commit: that guarantees that it does not matter how many test cases were

Re: Unexpected diff is shown with -w -b options in effect

2016-07-11 Thread Johannes Schindelin
Hi KES, On Mon, 11 Jul 2016, KES wrote: > For this diff > diff --git a/app/public/v2/index.html b/app/public/v2/index.html > index f73ba73..3af0c64 100644 > --- a/app/public/v2/index.html > +++ b/app/public/v2/index.html > @@ -21,11 +21,15 @@ > > > > - > - MOV > -

Unexpected diff is shown with -w -b options in effect

2016-07-11 Thread KES
Hi For this diff diff --git a/app/public/v2/index.html b/app/public/v2/index.html index f73ba73..3af0c64 100644 --- a/app/public/v2/index.html +++ b/app/public/v2/index.html @@ -21,11 +21,15 @@ - - MOV - ADD - DEL - + + + MOV + ADD

[PATCH] Fix running tests with --valgrind

2016-07-11 Thread Johannes Schindelin
We forgot to adjust this code path after moving the test helpers to t/helper/. Signed-off-by: Johannes Schindelin --- Published-As: https://github.com/dscho/git/releases/tag/valgrind-and-test-helpers-v1 t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1

Commits are no longer gpg-signed in 2.9.0 when "commit.gpgsign" is enabled

2016-07-11 Thread Nils Fenner
Hey Git community, since Version 2.9.0, the configuration option "commit.gpgsign" doesn't work as users would expect. By committing via 'git gui' (or usual 'git commit' without further option), commits are not being auto-signed any longer, when "commit.gpgSign" configuration option is set. I

Re: [PATCH] config.mak.uname: define NEEDS_LIBRT under Linux, for now

2016-07-11 Thread brian m. carlson
On Sun, Jul 10, 2016 at 10:16:44PM +, Eric Wong wrote: > My Debian wheezy LTS system is still on glibc 2.13; and LTS > distros may use older glibc, still, so lets not unnecessarily > break things out-of-the-box. > > We seem to assume Linux is using glibc in our Makefiles anyways, > so I don't

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

2016-07-11 Thread Johannes Schindelin
Hi Junio, On Fri, 8 Jul 2016, Junio C Hamano wrote: > * js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit > - am: counteract gender bias > > One part of "git am" had an oddball helper function that called > stuff from outside "his" as opposed to calling what we have "ours", >

Re: gc and repack ignore .git/*HEAD when checking reachability

2016-07-11 Thread Johannes Schindelin
Hi Duy, On Sun, 10 Jul 2016, Duy Nguyen wrote: > We will be able to see refs from all worktrees if we choose to. What I tried to say is: even if we make it technically feasible to have per-worktree refs or reflogs, the downsides are too prohibitive. We should simply not introduce support for