[ANNOUNCE] ssoma - some sort of mail archiver (using git)

2014-05-06 Thread Eric Wong
ssoma is a git-based mail archiver and transport. Email is injected via ssoma-mda(1) (MDA: mail delivery agent) on a server and may be shared (via git) and extracted to mbox, Maildir, or IMAP via ssoma(1). ssoma exists primarily as the mechanism (not policy) for public-inbox but may easily be use

Re: [PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems

2014-05-06 Thread Johannes Sixt
Am 5/7/2014 0:59, schrieb dtur...@twopensource.com: > From: David Turner > > Make it possible to change the case of a filename on a > case-insensitive filesystem using git mv. Change git mv to allow > moves where the destination file exists if either the destination file > has the same inode as

[PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-06 Thread Tolga Ceylan
When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index. When git-p4 runs git-apply to test the patch, git-apply rejects the patch due to abbreviated blob object names. This is the error messag

Re: git fast-import: how to prevent incremental commit with no changes

2014-05-06 Thread Timo Teras
On Tue, 06 May 2014 12:18:16 -0700 Junio C Hamano wrote: > Timo Teras writes: > > > I'm trying to script a setup that would periodically import a > > tarball to git with fast-import. But things do not always change, > > so I'd like fast-import to be able to not do the commit in case > > there i

Re: [PATCH 1/3] After chdir to run grep, return to old directory

2014-05-06 Thread David Turner
This causes my test to pass and generally seems correct to me. On Tue, 2014-05-06 at 23:00 -0400, Jeff King wrote: ... > That being said, this really seems like something that the run-command > interface should be doing, since it can handle the chdir in the forked > child. And indeed, it seems to

Re: [PATCH 1/2] inline constant return from error() function

2014-05-06 Thread Jeff King
On Tue, May 06, 2014 at 03:29:37PM -0700, Junio C Hamano wrote: > > We can work around this by encapsulating the constant return > > value in a static inline function, as gcc specifically > > avoids complaining about unused function returns unless the > > function has been specifically marked with

Re: [PATCH 1/3] After chdir to run grep, return to old directory

2014-05-06 Thread Jeff King
On Tue, May 06, 2014 at 05:06:51PM -0700, David Turner wrote: > On Tue, 2014-05-06 at 15:24 -0700, Junio C Hamano wrote: > > dtur...@twopensource.com writes: > > > > > From: David Turner > > > > > > Signed-off-by: David Turner > > > > Ehh, why? > > Briefly, because otherwise ./t7811-grep-open

Kitchen Design Lancashire Reviews

2014-05-06 Thread boaboa
I would recommend Kitchen Design Lancashire any day of the week. - Kitchen Design Lancashire Reviews -- View this message in context: http://git.661346.n2.nabble.com/Kitchen-Design-Lancashire-Reviews-tp7609861.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe fr

Re: [PATCH] completion: move out of contrib

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > These have been stable and widely used for quite a long time, they even > > have tests outside of the contrib area, and most distributions ship > > them, so they can be considered part of the core already. > > > > Let's move them out of contr

Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.

2014-05-06 Thread Nathan Collins
On Tue, May 6, 2014 at 2:12 PM, Junio C Hamano wrote: > Nathan Collins writes: > >> But 'git apply' could be much more helpful than 'patch' even, since >> the presence or absence of the 'a/' and 'b/' prefixes in the patch, >> and the 'diff.noprefix' setting, give Git enough info to be very >> hel

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > I _think_ it probably is OK for git-imerge.git/Makefile to peek into > our Makefile, e.g. > > $ cd git-imerge.git > $ make GIT_SOURCE_DIR=../git.git install > > to learn where imerge should install its subcommand implementation and > documentation. It might even w

Re: [PATCH] completion: move out of contrib

2014-05-06 Thread Junio C Hamano
Felipe Contreras writes: > These have been stable and widely used for quite a long time, they even > have tests outside of the contrib area, and most distributions ship > them, so they can be considered part of the core already. > > Let's move them out of contrib and install them by default. > >

Re: [PATCH 1/3] After chdir to run grep, return to old directory

2014-05-06 Thread David Turner
On Tue, 2014-05-06 at 15:24 -0700, Junio C Hamano wrote: > dtur...@twopensource.com writes: > > > From: David Turner > > > > Signed-off-by: David Turner > > Ehh, why? Briefly, because otherwise ./t7811-grep-open.sh fails when run under watchman. This is actually something that I think I'm doi

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Junio C Hamano
John Keeping writes: > I'd like to register my opposition to moving git-remote-{bzr,hg} out of > contrib/. > > I am not convinced that tools for interoperating with other VCSs need to > be part of core Git; as Junio has pointed out previously, while contrib/ > was necessary ... Associated tools c

Re: What's cooking in git.git (May 2014, #01; Tue, 6)

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > Plus this one which has been completely ignored: > > > >completion: move out of contrib > > It is not about "ignored". It is about running out of time before > concluding the day's integration. A comment doesn't require integration. Eith

Re: What's cooking in git.git (May 2014, #01; Tue, 6)

2014-05-06 Thread Junio C Hamano
Felipe Contreras writes: > Therefore the release notes are still lying to the users: > > * "git push" via transport-helper interface (e.g. remote-hg) has >been updated to allow ref deletion in a way similar to the natively >supported transports. > > That is not true. Hmph, you are right

RE: What's cooking in git.git (May 2014, #01; Tue, 6)

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > * fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits > - remote-hg: trivial cleanups > - remote-hg: make sure we omit multiple heads > - git-remote-hg: use internal clone's hgrc > - t: remote-hg: split into setup test > - remote-hg: properly detect missing cont

[PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems

2014-05-06 Thread dturner
From: David Turner Make it possible to change the case of a filename on a case-insensitive filesystem using git mv. Change git mv to allow moves where the destination file exists if either the destination file has the same inode as the source file (for Mac) or the same name ignoring case (for Wi

[PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-06 Thread dturner
From: David Turner On a case-insensitive filesystem, when merging, a file would be wrongly deleted from the working tree if an incoming commit had renamed it changing only its case. When merging a rename, the file with the old name would be deleted -- but since the filesystem considers the old n

[PATCH v2 2/2] checkout.c: use ref_exists instead of file_exist

2014-05-06 Thread Ronnie Sahlberg
Change checkout.c to check if a ref exists instead of checking if a loose ref file exists when deciding if to delete an orphaned log file. Otherwise, if a ref only exists as a packed ref without a corresponding loose ref for the currently checked out branch, we risk that the reflog will be deleted

[PATCH v2 1/2] refs.c: add new functions reflog_exists and delete_reflog

2014-05-06 Thread Ronnie Sahlberg
Add two new functions, reflog_exists and delete_reflog, to hide the internal reflog implementation (that they are files under .git/logs/...) from callers. Update checkout.c to use these functions in update_refs_for_switch instead of building pathnames and calling out to file access functions. Updat

[PATCH v2 0/2] add a reflog_exists and delete_reflog abstraction

2014-05-06 Thread Ronnie Sahlberg
This is a series adds two new functions to try to hide the reflog implementation details from the callers in checkout.c and reflog.c. It adds new functions to test if a reflog exists and to delete it, thus allowing checkout.c to perform this if-test-then-delete operation without having to know the

What's cooking in git.git (May 2014, #01; Tue, 6)

2014-05-06 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 tip of the 'master' branch has passed v2.0.0-rc1. Last minute fixes to newly added code keep flowing in, which is good. I've picked up som

Re: Pull is Mostly Evil

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: >But recording the merge to have parents does not give us >"the first-parent is the trunk" worldview, in the presense of B. >We would prefer to end up with a history more like this: > > -A O > \ \ >X---Y---Z---B'-

Re: [PATCH 1/2] inline constant return from error() function

2014-05-06 Thread Junio C Hamano
Jeff King writes: > Commit e208f9c introduced a macro to turn error() calls > into: > > (error(), -1) > > to make the constant return value more visible to the > calling code (and thus let the compiler make better > decisions about the code). > > This works well for code like: > > return erro

Re: Re: material for git training sessions/presentations

2014-05-06 Thread Jordan McCullough (GitHub Staff)
Hi Felipe, Jordan McCullough here from the GitHub Training team. I noticed you were kind enough to open a Pull Request (linked below for reference) addressing this. We really do appreciate the contribution. I'll review the PR just as soon as I can, so anticipate a merge with your changes to th

Re: [PATCH 1/3] After chdir to run grep, return to old directory

2014-05-06 Thread Junio C Hamano
dtur...@twopensource.com writes: > From: David Turner > > Signed-off-by: David Turner Ehh, why? > --- > builtin/grep.c | 14 -- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/builtin/grep.c b/builtin/grep.c > index 69ac2d8..e9fe040 100644 > --- a/builtin/grep.

Re: Pull is Mostly Evil

2014-05-06 Thread Junio C Hamano
Jeff King writes: > I realize this has veered off into talking about an "update" command, > and not necessarily "pull", but since there a lot of proposals floating > around, I wanted to make one point: if we are going to do such a switch, > let's please make it something the user explicitly turns

Re: [PATCH v2] config: preserve config file permissions on edits

2014-05-06 Thread Jeff King
On Tue, May 06, 2014 at 12:17:14AM +, Eric Wong wrote: > Users may already store sensitive data such as imap.pass in > .git/config; making the file world-readable when "git config" > is called to edit means their password would be compromised > on a shared system. Makes sense, and the patch l

Re: [PATCH v2] pager: remove 'S' from $LESS by default

2014-05-06 Thread Jeff King
On Tue, May 06, 2014 at 08:49:22PM +0200, Matthieu Moy wrote: > Exactly. I personally never use "git blame" outside "git gui blame" for > this reason. I'd recommend "tig blame" for this, too, which behaves like "less -S" with respect to long lines (and also makes it easy to jump to the full diff,

Re: [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass

2014-05-06 Thread James Denholm
Junio C Hamano wrote: >It is funny to see sign-off on 0/5 ;-) Yeah, I wasn't quite sure of exact protocol, and sort-of defaulted to sign-all-the-things mode. >By the way, this is v3, not v2, no? It was somewhat confusing to >see Peff saying "filfre to add my reviewed-by" on v2, noticing you >po

Re: [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass

2014-05-06 Thread Junio C Hamano
James Denholm writes: > contrib/subtree/Makefile is a shambles in regards to it's consistency > with other makefiles, which makes subtree overly painful to include in > build scripts. > > The main issues are that calls are made to git itself in the build > process, and that a subtree-exclusive va

Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.

2014-05-06 Thread Junio C Hamano
Nathan Collins writes: > But 'git apply' could be much more helpful than 'patch' even, since > the presence or absence of the 'a/' and 'b/' prefixes in the patch, > and the 'diff.noprefix' setting, give Git enough info to be very > helpful to the user. The prefix would be unreliable as the gener

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-05-06 Thread Junio C Hamano
Junio C Hamano writes: > The need to explain better with longer description will reduce the > likelyhood that the feature is understood and correctly used. When > you can write "1-2,4-", why accept "1-4 !3" and force yourself to > explain to people why that is different from "!3 1-4"? By the wa

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-05-06 Thread Junio C Hamano
Ilya Bobyr writes: > Allow better control of the set of tests that will be executed for a > single test suite. Mostly useful while debugging or developing as it > allows to focus on a specific test. > > Signed-off-by: Ilya Bobyr > --- > A number of minor changes according to the review comments

Re: [PATCH 0/3] Use ref transactions for fetch

2014-05-06 Thread Michael Haggerty
On 05/06/2014 08:40 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> It would be pretty annoying to spend a lot of time fetching a big pack, >> only to have the fetch fail because one reference out of many couldn't >> be updated. This would force the user to download the entire pack >>

Re: [GUILT 23/28] The log.decorate setting should not influence guilt rebase.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:32:01AM +0100, Per Cederqvist wrote: > Signed-off-by: Per Cederqvist > --- > guilt-rebase | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guilt-rebase b/guilt-rebase > index fd28e48..a1714a0 100755 > --- a/gu

Re: [GUILT 22/28] The log.decorate setting should not influence patchbomb.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:32:00AM +0100, Per Cederqvist wrote: > Signed-off-by: Per Cederqvist > --- > guilt-patchbomb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guilt-patchbomb b/guilt-patchbomb > index 1231418..164b10c 100755 >

Re: [GUILT 21/28] The log.decorate setting should not influence import-commit.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:31:59AM +0100, Per Cederqvist wrote: > Use --no-decorate in the call to git log that tries to read the commit > message to produce patch names. Otherwise, if the user has set > log.decorate to short or full, the patch name will be less

Re: Summary of the problems with git pull

2014-05-06 Thread Damien Robert
Felipe Contreras wrote in message <5366db742d494_18f9e4b308aa@nysa.notmuch>: > == git update == > > Another proposed solution is to have a new command: `git update`. This > command would be similar to `git pull --ff-only` by default, but it > could be configured to do merges instead, and when doi

Re: [GUILT 20/28] "guilt graph": Handle patch names containing quotes.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 03:57:37AM -0400, Eric Sunshine wrote: > On Fri, Mar 21, 2014 at 3:31 AM, Per Cederqvist wrote: > > Quote quotes with a backslash in the "guitl graph" output. Otherwise, > > s/guitl/guilt/ Yep. > > the "dot" file could contain syntax errors. > > > > Added a test case. >

Re: [GUILT 19/28] Check that "guilt graph" works when working on a branch with a comma.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote: > git branch names can contain commas. Check that "guilt graph" works > even in that case. > > Signed-off-by: Per Cederqvist > --- > regression/t-033.out | 62 > > regression/t-

Re: [GUILT 18/28] guilt-graph: Handle commas in branch names.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:31:56AM +0100, Per Cederqvist wrote: > This fix relies on the fact that git branch names can not contain ":". > > Signed-off-by: Per Cederqvist > --- > guilt-graph | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --g

Re: [GUILT 17/28] "guilt graph" no longer loops when no patches are applied.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:31:55AM +0100, Per Cederqvist wrote: > Give an error message if no patches are applied. Added a test case > that never terminates unless this fix is applied. > > Signed-off-by: Per Cederqvist > --- > guilt-graph | 10 ++

Re: [GUILT 11/28] test suite: remove pointless redirection.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek On Fri, Mar 21, 2014 at 08:31:49AM +0100, Per Cederqvist wrote: > The shouldfail function already redirects stderr to stdout, so there > is no need to do the same in t-028.sh and t-021.sh. > > Signed-off-by: Per Cederqvist > --- > regression/t-021.sh | 2 +- >

Re: [GUILT 10/28] Run test_failed if the exit status of a test script is bad.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:48AM +0100, Per Cederqvist wrote: > There were two problems with the old code: > > - Since "set -e" is in effect (that is set in scaffold) the run-test >script exited immediately if a t-*.sh script failed. This is not >nice, as we want the error report that

Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread Junio C Hamano
David Turner writes: > Would you prefer that I add it to t6022-merge-rename.sh? Or I could > add it to t7062-wtstatus-ignorecase.sh and rename that file to > t7062-ignorecase.sh. If I had only these two choices, t6022 would be it, as 6xxx series is where we have other tests for merge-recursiv

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > Having said that, I agree with the conclusion of your message: > > > There is a different level of urgency between "you cannot use this > > new feature until you update Git" and "if you update Mercurial then > > the remote helper will stop working", and that's why I think t

Re: [GUILT 07/28] Added test cases for "guilt fold".

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote: > Test that we can combine any combination of patches with empty and > non-empty messages, both with and without guilt.diffstat. (All > patches are empty.) I feel like we should have *some* content there - most of the time, I care mo

Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.

2014-05-06 Thread Nathan Collins
On Tue, May 6, 2014 at 11:10 AM, Junio C Hamano wrote: > Nathan Collins writes: > >> Hmmm. Maybe a warning that the patch is expected to be in '-p1' >> format, and that setting 'diff.noprefix=true' makes some commands >> generate '-p0' patches? > > "some"? Do you have exceptions in mind? As Jon

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Junio C Hamano
John Keeping writes: > On Mon, May 05, 2014 at 04:50:58PM -0700, Junio C Hamano wrote: >> ... >> At the same >> time, however, the interface the remote helpers use to talk to Git >> has not been as stable as you seem to think, I am afraid. For >> example, a recent remote-hg/bzr series needed som

Re: [PATCH] add a reflog_exists and delete_reflog abstraction

2014-05-06 Thread Ronnie Sahlberg
On Tue, May 6, 2014 at 12:15 PM, Junio C Hamano wrote: > Ronnie Sahlberg writes: > >> It currently has a hard assumption that the loose ref file must exist at this >> stage or else it would end up deleting the reflog which is true today, as far >> as I can tell, but would break if git would chang

Re: git fast-import: how to prevent incremental commit with no changes

2014-05-06 Thread Junio C Hamano
Timo Teras writes: > I'm trying to script a setup that would periodically import a tarball > to git with fast-import. But things do not always change, so I'd like > fast-import to be able to not do the commit in case there is no change. > > That is, I'm constructing the commit with "deleteall" +

Re: [PATCH] add a reflog_exists and delete_reflog abstraction

2014-05-06 Thread Junio C Hamano
Ronnie Sahlberg writes: > It currently has a hard assumption that the loose ref file must exist at this > stage or else it would end up deleting the reflog which is true today, as far > as I can tell, but would break if git would change such that we could have > a branch checked out without havin

Re: [GUILT 06/28] Fix and simplify the do_get_patch function.

2014-05-06 Thread Jeff Sipek
On Sun, Mar 23, 2014 at 10:03:48PM +0100, Per Cederqvist wrote: > On Sun, Mar 23, 2014 at 6:09 PM, Jeff Sipek wrote: > > > On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote: > >> When extracting the patch, we only want the actual patches. We don't > >> want the "---" delimiter. Sim

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Felipe Contreras
Junio C Hamano wrote: > John Keeping writes: > > > And it is now probably too late for that to make Git 2.0,... > > Anything with end-user visible changes in the core part that is not > a fix to a regression introduced between v1.9.0..master is too late > for the upcoming release. We are way pa

Re: [PATCH v2] pager: remove 'S' from $LESS by default

2014-05-06 Thread Matthieu Moy
David Kastrup writes: > Junio C Hamano writes: > >> I still find the output from "git blame" disturbing, though. The >> first thing I do in "git blame" output is to scroll to the right in >> order to identify the the area I am interested in, and this first >> step is not negatively affected, be

Re: [PATCH 0/3] Use ref transactions for fetch

2014-05-06 Thread Junio C Hamano
Michael Haggerty writes: > It would be pretty annoying to spend a lot of time fetching a big pack, > only to have the fetch fail because one reference out of many couldn't > be updated. This would force the user to download the entire pack > again,... Is that really true? Doesn't quickfetch op

Re: [GUILT 04/28] Allow "guilt import-commit" to run from a dir which contains spaces.

2014-05-06 Thread Jeff Sipek
On Sun, Mar 23, 2014 at 10:13:53PM +0100, Per Cederqvist wrote: > On Sun, Mar 23, 2014 at 9:07 PM, Jeff Sipek wrote: > > On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote: > >> On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek wrote: > >> > >> > On Fri, Mar 21, 2014 at 08:31:42AM +0100, Pe

Re: [PATCH] test doc: test_write_lines does not split its arguments

2014-05-06 Thread Michael S. Tsirkin
On Mon, May 05, 2014 at 04:51:43PM -0700, Jonathan Nieder wrote: > test_write_lines carefully quotes its arguments as "$@", so > > test_write_lines "a b" c > > writes two lines as requested, not three. > > Signed-off-by: Jonathan Nieder Acked-by: Michael S. Tsirkin > --- > Hi, > > Mic

Re: [PATCH] refs.c: add new functions reflog_exists and delete_reflog

2014-05-06 Thread Ronnie Sahlberg
Thanks. On Tue, May 6, 2014 at 8:55 AM, Michael Haggerty wrote: > On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote: >> Add two new functions, reflog_exists and delete_reflog to hide the internal > > Need comma after "delete_reflog". Done. And the other typos too. > >> reflog implementation (that th

Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.

2014-05-06 Thread Junio C Hamano
Nathan Collins writes: > Hmmm. Maybe a warning that the patch is expected to be in '-p1' > format, and that setting 'diff.noprefix=true' makes some commands > generate '-p0' patches? "some"? Do you have exceptions in mind? > But I worry this would just confuse / distract > the people that don'

Re: [PATCH v2] pager: remove 'S' from $LESS by default

2014-05-06 Thread David Kastrup
Junio C Hamano writes: > I still find the output from "git blame" disturbing, though. The > first thing I do in "git blame" output is to scroll to the right in > order to identify the the area I am interested in, and this first > step is not negatively affected, because the right scrolled output

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Junio C Hamano
John Keeping writes: > And it is now probably too late for that to make Git 2.0,... Anything with end-user visible changes in the core part that is not a fix to a regression introduced between v1.9.0..master is too late for the upcoming release. We are way past -rc1. >> So I think these are th

Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread David Turner
On Tue, 2014-05-06 at 10:07 -0700, Junio C Hamano wrote: > David Turner writes: > > > On a case-insensitive filesystem, when merging, a file would be > > wrongly deleted from the working tree if an incoming commit had > > renamed it changing only its case. When merging a rename, the file > > wit

Re: [PATCH v2] pager: remove 'S' from $LESS by default

2014-05-06 Thread Junio C Hamano
Matthieu Moy writes: >> > By default, Git used to set $LESS to -FRSX if $LESS was not set by the >> > user. The FRX flags actually make sense for Git (F and X because Git >> > sometimes pipes short output to less, and R because Git pipes colored >> > output). The S flag (chop long lines), on the

Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread Junio C Hamano
David Turner writes: > On a case-insensitive filesystem, when merging, a file would be > wrongly deleted from the working tree if an incoming commit had > renamed it changing only its case. When merging a rename, the file > with the old name would be deleted -- but since the filesystem > conside

Re: [PATCH] refs.c: add new functions reflog_exists and delete_reflog

2014-05-06 Thread Michael Haggerty
On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote: > Add two new functions, reflog_exists and delete_reflog to hide the internal Need comma after "delete_reflog". > reflog implementation (that they are files under .git/logs/...) from callers. > Update checkout.c to use these functions in update_refs_

Re: [PATCH] add a reflog_exists and delete_reflog abstraction

2014-05-06 Thread Michael Haggerty
On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote: > This is a single patch that adds two new functions to try to hide the reflog > implementation details from the callers in checkout.c and reflog.c. > It adds new functions to test if a reflog exists and to delete it, thus > allowing checkout.c to perf

[PATCH 2/2] let clang use the constant-return error() macro

2014-05-06 Thread Jeff King
Commit e208f9c converted error() into a macro to make its constant return value more apparent to calling code. Commit 5ded807 prevents us using this macro with clang, since clang's -Wunused-value is smart enough to realize that the constant "-1" is useless in some contexts. However, since the las

[PATCH 1/2] inline constant return from error() function

2014-05-06 Thread Jeff King
Commit e208f9c introduced a macro to turn error() calls into: (error(), -1) to make the constant return value more visible to the calling code (and thus let the compiler make better decisions about the code). This works well for code like: return error(...); but the "-1" is superfluous in

Re: [PATCH 9/9] diff: convert struct combine_diff_path to object_id

2014-05-06 Thread Michael Haggerty
On 05/03/2014 10:12 PM, brian m. carlson wrote: > Signed-off-by: brian m. carlson > --- > combine-diff.c | 54 +++--- > diff-lib.c | 10 +- > diff.h | 5 +++-- > 3 files changed, 35 insertions(+), 34 deletions(-) > > diff --git

Re: [PATCH 8/9] cache-tree: convert struct cache_tree to use object_id

2014-05-06 Thread Michael Haggerty
On 05/03/2014 10:12 PM, brian m. carlson wrote: > [...] > diff --git a/cache-tree.c b/cache-tree.c > index 7fa524a..b7b2d06 100644 > --- a/cache-tree.c > +++ b/cache-tree.c In this file I also found a couple other "20" that could be converted to GIT_OID_RAWSZ: Around line 369: str

Re: [PATCH 8/9] cache-tree: convert struct cache_tree to use object_id

2014-05-06 Thread Michael Haggerty
On 05/03/2014 10:12 PM, brian m. carlson wrote: > Signed-off-by: brian m. carlson > --- > builtin/commit.c | 2 +- > builtin/fsck.c | 4 ++-- > cache-tree.c | 30 +++--- > cache-tree.h | 3 ++- > merge-recursive.c | 2 +- > reacha

Re: [PATCH 7/9] bundle.c: convert leaf functions to struct object_id

2014-05-06 Thread Michael Haggerty
On 05/03/2014 10:12 PM, brian m. carlson wrote: > Signed-off-by: brian m. carlson > --- > bundle.c | 38 +++--- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/bundle.c b/bundle.c > index 1222952..798ba28 100644 > --- a/bundle.c > +++ b/bundle

read-tree bug

2014-05-06 Thread Klishevich, Yauheni
Some more info: If I use in 5-th command “—prefix=--prefix=mb/trunk/src/libs“ - issue is reproduced If “—prefix=--prefix=mb/libs“ - all work fine With “—prefix=--prefix=mb/trunk/libs“ I haven’t tried, if it is desired to check this case, just let me know. On 5/6/14,

[PATCH v2 4/5] contrib/subtree/Makefile: Doc-gen rules cleanup

2014-05-06 Thread James Denholm
git:Documentation/Makefile establishes asciidoc/xmlto calls as being handled through their appropriate variables, Hence, change to bring into congruency with. Similarly, MANPAGE_XSL exists in git:Documentation/Makefile, while MANPAGE_NORMAL_XSL does not outside contrib/subtree. Hence, replace MANP

[PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass

2014-05-06 Thread James Denholm
contrib/subtree/Makefile is a shambles in regards to it's consistency with other makefiles, which makes subtree overly painful to include in build scripts. The main issues are that calls are made to git itself in the build process, and that a subtree-exclusive variable is used for specifying the e

[PATCH v2 1/5] contrib/subtree/Makefile: scrap unused $(gitdir)

2014-05-06 Thread James Denholm
In 7ff8463dba0d74fc07a766bed457ae7afcc902b5, the references to gitdir were removed but the assignment itself wasn't. Hence, drop the gitdir assignment. Reviewed-by: Jeff King Signed-off-by: James Denholm --- contrib/subtree/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/sub

[PATCH v2 2/5] contrib/subtree/Makefile: Use GIT-VERSION-FILE

2014-05-06 Thread James Denholm
GVF is already being used in most/all other makefiles in the project, and has been for _quite_ a while. Hence, drop file-unique gitver and replace with GIT_VERSION. Reviewed-by: Jeff King Signed-off-by: James Denholm --- contrib/subtree/Makefile | 11 --- 1 file changed, 8 insertions(+)

[PATCH v2 3/5] contrib/subtree/Makefile: s/libexecdir/gitexecdir

2014-05-06 Thread James Denholm
$(libexecdir) isn't used anywhere else in the project, while $(gitexecdir) is the standard in the other appropriate makefiles. Hence, replace the former with the latter. Reviewed-by: Jeff King Signed-off-by: James Denholm --- contrib/subtree/Makefile | 6 +++--- 1 file changed, 3 insertions(+),

[PATCH v2 5/5] contrib/subtree/Makefile: clean rule cleanup

2014-05-06 Thread James Denholm
git:Documentation/Makefile and others establish "RM ?= rm -f" as a convention for rm calls in clean rules, hence follow this convention instead of simply forcing clean to use rm. subproj and mainline no longer need to be removed in clean, as they are no longer created in git:contrib/subtree by "ma

Re: [PATCH v2 0/5] contrib/subtree/Makefile: Standardisation pass

2014-05-06 Thread James Denholm
On 6 May 2014 08:01, Jeff King wrote: > [fixed David's address in cc list] Ah, right. Wasn't sure what was going on there. > On Tue, May 06, 2014 at 07:54:30AM +1000, James Denholm wrote: > >> Given that subtree subtree doesn't really generate a lot of discussion, >> would it be advisable to wra

read-tree bug

2014-05-06 Thread Klishevich, Yauheni
Hello! I have some troubles with git command ³read-tree². I have big project and I try to add shared library to subdirectory. So I made the following in my project (on master) git remote add g...@bitbucket.org:ijin1984/groundwork.git git fetch groundwork git checkout ­b gwbranch groundwork/maste

Re: git gui error with relocated repository

2014-05-06 Thread Pat Thoyts
Chris Packham writes: >On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham wrote: >> Hi Pat, >> >> I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) >> which includes gitgui-0.19.0 and I'm getting a new error when I run >> 'git gui' in a repository with a .git file (created by git

Summary of the problems with git pull

2014-05-06 Thread Felipe Contreras
Hi, There has been a lot of discussion about why `git pull` is broken for so many many workflows: [1][2][3][4][5], even as far back as [6]. Many issues has been brought up, and many proposed solutions, probably too many for most people properly digest them, so here I'll try to synthesize them. M

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

2014-05-06 Thread Erik Faye-Lund
On Mon, May 5, 2014 at 11:46 PM, Jeff King wrote: > On Sun, May 04, 2014 at 08:13:15AM +0200, Torsten Bögershausen wrote: > >> > 1. Tell everyone that NFD in the git repo is wrong, and >> > they should make a new commit to normalize all their >> > in-repo files to be precomposed. >> >

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread Felipe Contreras
John Keeping wrote: > The Mercurial API makes no such guarantee; it is considered a private > implementation detail and most releases seem to contain some changes > that require all consumers to be updated. > > There is a different level of urgency between "you cannot use this new > feature until

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-06 Thread John Keeping
On Mon, May 05, 2014 at 04:50:58PM -0700, Junio C Hamano wrote: > John Keeping writes: > > Having said all that, there is one caveat. > > > Since the remote helper interface is stable and the remote helpers do > > not use any of the Git internals, I consider the risks of including them > > in co