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

Jeff King p...@peff.net writes: This patch just adds a test to demonstrate the breakage. Some possible fixes are: 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. This is probably

Re: [PATCH v3 16/19] branch.c: use ref transaction for all ref updates

Michael Haggerty mhag...@alum.mit.edu writes: I have no compunctions about using update() to create or delete a reference. My point of view is that update() is the general case, and create() and delete() are special-cases that exist only for the convenience of callers. For example, our

Re: [PATCH] Uses git-credential for git-imap-send

Jeff King p...@peff.net writes: On Mon, Apr 28, 2014 at 08:00:04PM -0700, Dan Albert wrote: I noticed that we are just filling in the password here, since we'll always fill cred.username from srvc-user. The lines directly above are: if (!srvc-user) {

Re: [PATCH 17/32] read-cache: split-index mode

Duy Nguyen pclo...@gmail.com writes: I do think it is sensible to keep two arrays of struct cache_entry around (one for base and one for incremental changes) inside index_state, and the patch seems to do so via struct split_index that does have a copy of saved_cache. If the write-out

Re: Tagging a branch as not fitted for branching ?

Jean-Noël Avila avila...@gmail.com writes: In your daily management of the pu branch for git, do you have to use the -f flag a lot? During the day I prepare and validate all the branches I am going to publish, and at the end of the day, I run git push (no options) with something like this

Re: git subtree issue in more recent versions

Kevin Cagle (kcagle) [CONT - Type 2] kca...@micron.com writes: $ git subtree add -P oldGit https://github.com/git/git.git tags/v1.9.2 Will produce this error: 10ff115f5c572299de4e04ade0d7adb3c75fbf1f is not a valid 'commit' object The bug isn't found in 1.7.1 (installed subtree manually)

Re: [PATCH] Document RUN_SETUP_GENTLY

David Turner dtur...@twopensource.com writes: Document RUN_SETUP_GENTLY Signed-off-by: David Turner dtur...@twitter.com --- Documentation/technical/api-builtin.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/technical/api-builtin.txt

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

Jeff King p...@peff.net writes: I don't think we have a str_utf8_cmp that ignores normalizations (or maybe strcoll will do this?). But in theory we could use it everywhere we use strcasecmp for ignore_case. And then we would not need to have our readdir wrapper, maybe? I admit I haven't

Re: [PATCH v4 2/2] test/send-email: to-cover, cc-cover tests

Michael S. Tsirkin m...@redhat.com writes: Add tests for the new feature. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 45 + 1 file changed, 45 insertions(+) diff --git a/t/t9001-send-email.sh

Re: [PATCH 24/32] split-index: strip pathname of on-disk replaced entries

This triggers saved_namelen may be used uninitialized for me, even though it looks clear that it is used under CE_STRIP_NAME and it is assigned under that condition. Sigh to a stupid compiler... -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v4 00/27] Use ref transactions for all ref updates

Ronnie Sahlberg sahlb...@google.com writes: This patch series is based on mhagger/ref-transactions and expands on the transaction API. It converts all external (outside of refs.c) callers to use the transaction API for any writes. This makes most of the ref updates to become atomic when there

Re: [PATCH v11 00/11] Add interpret-trailers builtin

Thanks and sorry for taking a bit longer than usual; will push this series out, replacing the previous round, when I am done for today's integration cycle. -- 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

Re: [PATCH v1 0/4] replace: add option to edit a Git object

Jeff King p...@peff.net writes: On Sat, Apr 26, 2014 at 10:00:53PM +0200, Christian Couder wrote: This patch series comes from what Peff sent in the following thread: http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528 Thanks. As I recall, these were in pretty good

Re: [PATCH v6 1/5] patch-id: make it stable against hunk reordering

Thanks. I'll revert the merge of the previous round to 'next' and then queue this series instead. -- 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 v4 15/27] fast-import.c: change update_branch to use ref transactions

Ronnie Sahlberg sahlb...@google.com writes: + transaction = ref_transaction_begin(); + if ((!transaction || + ref_transaction_update(transaction, b-name, b-sha1, old_sha1, +0, 1)) || + (ref_transaction_commit(transaction, msg, err) +

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

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

Re: [PATCH 17/32] read-cache: split-index mode

Duy Nguyen pclo...@gmail.com writes: when no entry is reused). I kinda hope to avoid that. I see. Speaking about reusing cache_entry, we won't be able to share cache_entry because when it's freed in replace_index_entry, or remove_index_entry_at in the main index, we need to locate the same

Re: [PATCH] rerere: fix for merge.conflictstyle

Jeff King p...@peff.net writes: I could not reproduce the problem with a trivial case, and rerere specifically tries to handle the differences between merge and diff3 styles by throwing away the base content between | and = lines. However, I wonder if it could still miss a match in some cases

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

Ilya Bobyr ilya.bo...@gmail.com writes: The above two illustrate the reason rather well why I said it would be better to avoid negation because it would complicate the mental model the user needs to form when using the feature. I think that you do not have to use it if you do not need it.

Re: Pull is Evil (was: Re: A failing attempt to use Git in a centralized environment)

Marc Branchaud marcn...@xiplink.com writes: But I'm definitely biased because I think pull is pretty much broken: * New users are encouraged to use pull, but all too often the default fetch-then-merge behaviour doesn't match their expectations and they end up starting threads like this one

Re: [PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Erik Faye-Lund kusmab...@gmail.com writes: This is wrong, no? With CURL_CONFIG not set, it currently *does* run curl-config, see below. ... ifdef CURLDIR + CURL_LIBCURL = + else + CURL_CONFIG = curl-config + ifeq $(CURL_CONFIG) +

Re: [PATCH/RFC] Makefile: do not depend on curl-config

Erik Faye-Lund kusmab...@gmail.com writes: MinGW builds of cURL does not ship with curl-config unless built with the autoconf based build system, which is not the practice recommended by the documentation. MsysGit has had issues with binaries of that sort, so it has switched away from

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

Matthieu Moy matthieu@imag.fr 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

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

Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@imag.fr 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

Re: [PATCH v5 0/6] Reject non-ff pulls by default

Felipe Contreras felipe.contre...@gmail.com writes: These are the steps needed to achieve this: The overall progression (this comment is only about the design, not the implementation) looks almost sensible, but I may have missed some issues because the presentation was done in reverse. In the

Re: [GIT PULL] l10n updates for 2.0.0 round 1

Thanks, pulled. -- 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 01/14] t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution

Matthieu Moy matthieu@grenoble-inp.fr writes: Patches 1/14 are Reviewed-by: Matthieu Moy matthieu@imag.fr On a side note, reviewing patches by batches of 14 patches actually turns out to be much less convenient for me than reviewing larger batches. If I'm counting correctly,

Re: [PATCH v2] Document RUN_SETUP_GENTLY

David Turner dtur...@twopensource.com writes: Sorry about that -- the documentation of RUN_SETUP confused me. So I have a new patch that edits that as well. -- RUN_SETUP_GENTLY and improve RUN_SETUP docs Signed-off-by: David Turner dtur...@twitter.com --- You do not want to have Sorry

Re: [PATCH] MSVC: link dynamically to the CRT

Stepan Kasal ka...@ucw.cz writes: From: Karsten Blees bl...@dcon.de Date: Fri, 7 Jan 2011 17:20:21 +0100 Dynamic linking is generally preferred over static linking, and MSVCRT.dll has been integral part of Windows for a long time. This also fixes linker warnings for _malloc and _free in

Re: Pull is Evil

. Do I? Let's look at some of the discussions: http://thread.gmane.org/gmane.comp.version-control.git/225146 * W. Trevor King agrees the default should change * Junio C Hamano agrees the default should change * John Keeping agrees the default should change * Matthieu Moy doesn't agree

Re: [PATCH v5 0/6] Reject non-ff pulls by default

Felipe Contreras felipe.contre...@gmail.com writes: - With the endgame of out of box Git without any configuration refuses 'git pull' (without --merge/--rebase) that does not fast forward in mind, start warning In the future you will have to either set pull.mode (and/or

Re: [PATCH v5 0/6] Reject non-ff pulls by default

Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: ... Until the --merge option is added, pull.mode = merge cannot be the same as git pull --merge. I think you either need to squash these two steps into one, or flip the order of them. Yeah, but the documentation

Re: [PATCH v5 0/6] Reject non-ff pulls by default

Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: ... This plan, however, fell off the cliff. Yeah, I see that $gmane/234488 explains why the second step in the previous one stopped. I guess it was in expecting

Re: Pull is Evil

Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Matthieu Moy wrote: Felipe Contreras felipe.contre...@gmail.com writes: ... Yes, this has been discussed many times in the past, and everyone agrees

Re: [PATCH] MSVC: link dynamically to the CRT

Sebastian Schuberth sschube...@gmail.com writes: On 30.04.2014 20:36, Junio C Hamano wrote: I am not intimate with the msysgit developer community, and I do not know if it is appropriate for me to respond with a Does this look OK with msysgit folks? This patch has been carried

Re: Pull is Evil

Marc Branchaud marcn...@xiplink.com writes: On 14-04-30 10:55 AM, Junio C Hamano wrote: Marc Branchaud marcn...@xiplink.com writes: ... Anyway, rather than ranting on I'll just suggest that there's not enough commonality between the ways people use git to make it worthwhile trying to teach

Re: [RFD] use approxidate for git commit --date=xyz?

Linus Torvalds torva...@linux-foundation.org writes: I just got a comment saying that git commit --amend --date=now doesn't work. I replied that you can use --date=$(date) Offhand without double-checking the actual codepath I do not have objection against approxidate-careful. But

[PATCH 0/8] Update the CodingGuidelines

to this series. Junio C Hamano (8): CodingGuidelines: typofix CodingGuidelines: give an example for case/esac statement CodingGuidelines: give an example for redirection CodingGuidelines: give an example for control statements CodingGuidelines: give an example for shell function preamble

[PATCH 6/8] CodingGuidelines: call the conditional statement if (), not if()

The point immediately before it is about having SP after the control keyword. Follow it. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation

[PATCH 3/8] CodingGuidelines: give an example for redirection

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 9b103cb..1e0c4cf 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation

[PATCH 4/8] CodingGuidelines: give an example for control statements

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 11 +++ 1 file changed, 11 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 1e0c4cf..d72e912 100644 --- a/Documentation/CodingGuidelines +++ b

[PATCH 2/8] CodingGuidelines: give an example for case/esac statement

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index fdf6269..9b103cb 100644 --- a/Documentation/CodingGuidelines

[PATCH 1/8] CodingGuidelines: typofix

The sentence lacked the necessary verb. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index f424dbd..fdf6269 100644

[PATCH 5/8] CodingGuidelines: give an example for shell function preamble

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index d72e912..1b0cd2b 100644 --- a/Documentation/CodingGuidelines

[PATCH 8/8] CodingGuidelines: once it is in, it is not worth the code churn

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 86fb9f6..759003e 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation

[PATCH 7/8] CodingGuidelines: on comparison

See http://thread.gmane.org/gmane.comp.version-control.git/3903/focus=4126 Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 26 ++ 1 file changed, 26 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation

Re: [PATCH 4/8] CodingGuidelines: give an example for control statements

Stefan Beller stefanbel...@gmail.com writes: On 30.04.2014 23:45, Junio C Hamano wrote: Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 11 +++ 1 file changed, 11 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation

[PATCH v2 3/8] CodingGuidelines: give an example for redirection

Signed-off-by: Junio C Hamano gits...@pobox.com --- * Instead of using trailing # correct comment on each of the one-liners, group the good ones and the bad ones into two groups and give (incorrect)/(correct) header like the other patches as suggested. How does this look? The only

Re: Pull is Evil

Felipe Contreras felipe.contre...@gmail.com writes: brian m. carlson wrote: .. At work, we have a workflow where we merge topic branches as non-fast-forward, so that we have a record of the history (including who reviewed the code), but when we want to just update our local branches, we

Re: [PATCH 1/8] CodingGuidelines: typofix

David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: The sentence lacked the necessary verb. No, it didn't. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 4/8] CodingGuidelines: give an example for control statements

David Kastrup d...@gnu.org writes: - We do not write the noiseword function in front of shell s/noiseword/bashism/ That is outside the scope of this patch, but since you brought it up... I did consider between noiseword and bashism when I wrote this part, and decided against bashism. XCU

Re: [PATCH 6/8] CodingGuidelines: call the conditional statement if (), not if()

David Kastrup d...@gnu.org writes: - - We try to avoid assignments inside if(). + - We try to avoid assignments inside if () condition. That's not grammatical. OK, ... inside the condition part of an if () statement. then? -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH] Add extra logic required to detect endianness on Solaris

Charles Bailey cbaile...@bloomberg.net writes: #if !defined(__BYTE_ORDER) +/* Known to be needed on Solaris but designed to potentially more portable */ + +#if !defined(__BIG_ENDIAN) +#define __BIG_ENDIAN 4321 +#endif + +#if !defined(__LITTLE_ENDIAN) +#define __LITTLE_ENDIAN 1234

Re: [PATCH] Add extra logic required to detect endianness on Solaris

Junio C Hamano gits...@pobox.com writes: Charles Bailey cbaile...@bloomberg.net writes: #if !defined(__BYTE_ORDER) +/* Known to be needed on Solaris but designed to potentially more portable */ + +#if !defined(__BIG_ENDIAN) +#define __BIG_ENDIAN 4321 +#endif + +#if !defined

Re: [PATCH] Add extra logic required to detect endianness on Solaris

Junio C Hamano gits...@pobox.com writes: Just a thought. I am wondering if you may want to go the other way around. That is, instead of using we have byte-order, big and little and the way to determine endianness is to see byte-order matches which of the latter two, use there may be either

Re: [PATCH] Detect endianness on more platforms that don't use BYTE_ORDER

Charles Bailey cbaile...@bloomberg.net writes: --- Please sign-off your patches ;-) This swaps the precedence of BYTE_ORDER and __BYTE_ORDER from the original, which we may not want to. It is easy for me to swap the order of if/elif to restore it, so it is not a big deal, though. Thanks.

Re: #178 parsing of pretty=format:%an %ad causes fatal: bad revision '%ad'

having a feeling that this is either an issue specific to the Windows port, or more likely a user error, depending on who is giving the extra dq quoting. From the command line: $ git show --pretty='format:%an %ad' Junio C Hamano Wed Apr 30 11:01:42 2014 -0700 Because the 'format:' specifier

Re: Pull is Mostly Evil

Marc Branchaud marcn...@xiplink.com writes: (Apologies for not CCing all the folks who've participated in the Pull is Evil thread -- I couldn't find a good branch of that thread for this message.) OK, so maybe git pull is just Mostly Evil. People seem to have found many different ways to

Re: [PATCH 7/8] CodingGuidelines: on comparison

Jeff King p...@peff.net writes: On Wed, Apr 30, 2014 at 02:45:11PM -0700, Junio C Hamano wrote: See http://thread.gmane.org/gmane.comp.version-control.git/3903/focus=4126 Signed-off-by: Junio C Hamano gits...@pobox.com Don't you often complain about submitters referencing a discussion

Re: [PATCH 1/8] CodingGuidelines: typofix

Jeff King p...@peff.net writes: On Thu, May 01, 2014 at 10:51:19AM -0700, Junio C Hamano wrote: If you want to fix something here, do s/judgement/judgment/ instead. That too. FWIW, neither is outright wrong; it is an America/British variation, and apparently dictionaries disagree

Re: Pull is Evil

Marc Branchaud marcn...@xiplink.com writes: I may be mistaken, but I think git pull evolved to try to address the detached-HEAD risk (at least in part). You are totally mistaken. git pull was part of the things to make git usable by Linus before 1.0 release, and matches the integrator

Re: [PATCH] Detect endianness on more platforms that don't use BYTE_ORDER

Charles Bailey cbaile...@bloomberg.net writes: I claim that any platform which provides both but with differing senses is somewhat broken so I cannot see the precedence mattering much. I agree with that, and that is the reason why we shouldn't change the order all of a sudden. If it

Re: [PATCH] Detect endianness on more platforms that don't use BYTE_ORDER

Junio C Hamano gits...@pobox.com writes: Charles Bailey cbaile...@bloomberg.net writes: I claim that any platform which provides both but with differing senses is somewhat broken so I cannot see the precedence mattering much. I agree with that, and that is the reason why we shouldn't

Re: Pull is Evil

Junio C Hamano gits...@pobox.com writes: Marc Branchaud marcn...@xiplink.com writes: I may be mistaken, but I think git pull evolved to try to address the detached-HEAD risk (at least in part). You are totally mistaken. git pull was part of the things to make git usable by Linus before

Re: Pull is Mostly Evil

Felipe Contreras felipe.contre...@gmail.com writes: Stepping back even further, and thinking what is different between these two pulls, we notice that the first one is pulling from the place we push back to. Perhaps a way to solve this issue, without having to introduce a new 'git update'

Re: [PATCH 7/8] CodingGuidelines: on comparison

Jeff King p...@peff.net writes: I meant something even less in-depth. Your message says only on comparison, and I did not even know what this in your sentence above would mean until I followed the link. There are arguments for writing a conditional as a b rather than b a, or vice

[PATCH 9/8] CodingGuidelines: on splitting a long line

Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 55 ++ 1 file changed, 55 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 02ca67c..4dd07c3 100644 --- a/Documentation

Re: smudge/clean filters and SHA1 hashes

Leo Razoumov slonik...@gmail.com writes: In presence of smudge/clean filters which SHA1 hash (clean content or smudged content) gets stored in the repository? You are cleaning cruft in the contents before the contents are hashed to compute the object name. The point is to keep clean objects

Re: BUG or FEATURE? Use of '/' in branch names

Keith Derrick keith.derr...@lge.com writes: The problem arises when a branch already exists with a name matching the stem of the new branch name. ... But, for the reverse reason, I can't now create the branch named 'hotfix' All correct. Allowing '/' in branch names came about not with a

[ANNOUNCE] Git v2.0.0-rc2

for the command line Jiang Xin (2): l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) l10n: zh_CN.po: translate 46 new messages (2229t0f0u) Junio C Hamano (2): Revert the whole ask curl-config topic for now Git 2.0-rc2 Kyle J. McKay (1): t9117: use --prefix instead of --prefix

Re: [msysGit] Re: #178 parsing of pretty=format:%an %ad causes fatal: bad revision '%ad'

Dave Bradley dbradl...@bell.net writes: Original #178 content G:\ws_test_env\GIT_TESTBED_TMP\fest-swing-1.xgit log --all --pretty=format:%an%ad -- pom.xml Mon Nov 23 03:09:17 2009 + Mon Nov 23 02:42:24 2009 + This added to my confusion as by right dq

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

John Keeping j...@keeping.me.uk writes: On Tue, Apr 29, 2014 at 03:38:07PM -0700, Junio C Hamano wrote: * fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits ... Move remote-hg and remote-bzr out of contrib/. There were some suggestions on the follow-up fix patches still

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

David Turner dtur...@twopensource.com 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

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

Matthieu Moy matthieu@grenoble-inp.fr 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

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

John Keeping j...@keeping.me.uk 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

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

Nathan Collins nathan.coll...@gmail.com 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

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

Michael Haggerty mhag...@alum.mit.edu 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?

Re: [PATCH] add a reflog_exists and delete_reflog abstraction

Ronnie Sahlberg sahlb...@google.com 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

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

Timo Teras timo.te...@iki.fi 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

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

John Keeping j...@keeping.me.uk 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

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

David Turner dtur...@twopensource.com 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

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

Ilya Bobyr ilya.bo...@gmail.com 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 ilya.bo...@gmail.com --- A number of minor

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

Junio C Hamano gits...@pobox.com 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

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

Nathan Collins nathan.coll...@gmail.com 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

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

James Denholm nod.h...@gmail.com 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

Re: Pull is Mostly Evil

Jeff King p...@peff.net 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

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

dtur...@twopensource.com writes: From: David Turner dtur...@twitter.com Signed-off-by: David Turner dtur...@twitter.com Ehh, why? --- builtin/grep.c | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index

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

Jeff King p...@peff.net 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

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

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

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

Felipe Contreras felipe.contre...@gmail.com 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.

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

John Keeping j...@keeping.me.uk 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 ...

Re: [PATCH] completion: move out of contrib

Felipe Contreras felipe.contre...@gmail.com 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

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

Jeff King p...@peff.net writes: On Tue, May 06, 2014 at 08:49:22PM +0200, Matthieu Moy wrote: ... The idea of having a separate default value for pager.blame (or set $LESS differently for blame) crossed my mind, but I actually don't like it, as it would make it harder for a user to fine-tune

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

Tolga Ceylan tolga.cey...@gmail.com writes: 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

Re: [PATCH] completion: move out of contrib

Felipe Contreras felipe.contre...@gmail.com writes: As an example of all the hacks needed by a real distribution package, here's the stuff ArchLinux packagers have to do: # bash completion mkdir -p $pkgdir/usr/share/bash-completion/completions/ install -m644

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

David Turner dtur...@twopensource.com writes: This causes my test to pass and generally seems correct to me. Yes, this approach is very sensible, and I'll queue. But watchman support _should_ be prepared for a program that does not do this. Developing your support in on a codebase with this

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

David Turner dtur...@twopensource.com writes: On Wed, 2014-05-07 at 08:17 +0200, Johannes Sixt wrote: } else if (cache_name_pos(src, length) 0) bad = _(not under version control); - else if (lstat(dst, st) == 0) { + else if (lstat(dst,

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

dtur...@twopensource.com writes: +if ! test_have_prereq CASE_INSENSITIVE_FS +then + skip_all='skipping case insensitive tests - case sensitive file system' + test_done +fi + +test_expect_success 'merge with case-changing rename' ' + test $(git config core.ignorecase) = true

Re: [PATCH 0/4] remote-hg: more improvements

Felipe Contreras felipe.contre...@gmail.com writes: Here's a bunch of tests more, and a fixes for Mercurial v3.0. I think the discussion with John Keeping hints that we shouldn't be rushing fc/remote-helpers-hg-bzr-graduation and this does not appear to assume the presense of that series, which

Re: [PATCH 3/3] Silence a bunch of format-zero-length warnings

Jeff King p...@peff.net writes: On Sun, May 04, 2014 at 07:01:22PM +, brian m. carlson wrote: On Sun, May 04, 2014 at 01:12:55AM -0500, Felipe Contreras wrote: This is in gcc 4.9.0: wt-status.c: In function ‘wt_status_print_unmerged_header’: wt-status.c:191:2: warning:

<    9   10   11   12   13   14   15   16   17   18   >