[PATCH] wincred: add install target and avoid overwriting configured variables

From: Pat Thoyts Date: Wed, 24 Oct 2012 00:15:29 +0100 Signed-off-by: Pat Thoyts Signed-off-by: Stepan Kasal --- Another one from msysGit project. Original subject by Pat; I would suggest: wincred: improve Makefile contrib/credential/wincred/Makefile | 22 ++ 1 file cha

RE: [PATCH] zsh completion: 5.0.3 compat, use emulate

Phil Pennock wrote: > The bash completion pulled into zsh was being pulled in _as_ zsh, but > used patterns which relied on falling through as unhandled. In zsh > 5.0.3 this no longer works, resulting in: > > __git_complete_remote_or_refspec:33: bad pattern: +* > > Fix by telling zsh to emul

RE: [PATCH] git-completion.zsh: do not clobber complete()

Mark Lodato wrote: > Previously, git-completion.zsh redefined complete() to make > __git_complete() a no-op. This broke zsh's built-in bash completion > compatibility layer (bashcompinit), which defines its own complete(). How exactly? I'm testing this and I don't see any problems. I run 'type -f

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

On Tue, Apr 29, 2014 at 11:08:29PM -0500, Felipe Contreras wrote: > If we use a different conflict style `git rerere forget` is not able to > find the matching conflict SHA-1 because the diff generated is actually > different from what `git merge` generated. Can you show an example or test case?

[ANNOUNCE] tig-2.0

A little over 8 years ago the first version of Tig was released. To celebrate the many years with this cursed Git interface, here is a fresh new installment. Version 2.0 of Tig brings several configuration improvements, some of which unfortunately also breaks backwards compatibility with respect to

[PATCH] rerere: fix for merge.conflictstyle

If we use a different conflict style `git rerere forget` is not able to find the matching conflict SHA-1 because the diff generated is actually different from what `git merge` generated. The fix is to call git_xmerge_config() so that git_xmerge_style is set properly and the diffs match. Signed-of

Re: Recording the current branch on each commit?

On Mon, Apr 28, 2014 at 11:15:10AM -0700, Junio C Hamano wrote: > "Any additional information about the commit can be added" you > suggest is exactly the kind of thing we want to avoid, which made > Linus say in an even older discussion [*2*]: > > No "this random field could be used this rando

Re: [PATCH] subtree/Makefile: Standardize (esp. for packagers)

On Sun, Apr 27, 2014 at 12:35:13PM +1000, James Denholm wrote: > Jeff King wrote: > >I think the problem is that > >contrib/subtree does not really have an active dedicated area > >maintainer. > > Yeah, I can see how that might become a bit of a problem. I was > actually thinking of doing a bit o

[GIT PULL] l10n updates for 2.0.0 round 1

Hi Junio, The following changes since commit cc291953df19aa4a97bee3590e708dc1fc557500: Git 2.0-rc0 (2014-04-18 11:21:43 -0700) are available in the git repository at: git://github.com/git-l10n/git-po for you to fetch changes up to 94f94fcbf2b1009da358fbe06edffbd206d9fa7a: l10n: de.po: i

Re: Recording the current branch on each commit?

Felipe Contreras wrote: > You are obviously not very good with analogies, or reading for that > matter. The answer is quoted right in the begginning of the mail. > Congratulations, you've achieved a mail quote loop. I'll rephrase the question and it's context. Please attempt to answer it. You've

Re: Recording the current branch on each commit?

James Denholm wrote: > Felipe Contreras wrote: > > James Denholm wrote: > >> > Either way your analogy is completely wrong as I already explained > >> > multiple times. I'm not trying to convince vegetarians to go > >> > hunting, I'm saying they should eat something, bread, meat, > >> > vegetables,

Re: Recording the current branch on each commit?

Felipe Contreras wrote: > James Denholm wrote: >> > Either way your analogy is completely wrong as I already explained >> > multiple times. I'm not trying to convince vegetarians to go >> > hunting, I'm saying they should eat something, bread, meat, >> > vegetables, anything. Instead they choose to

Re: git cascade and git forward-merge

Schuyler Duveen wrote: > This was a feature that I've really wanted for a while. I took a bit > of time to morph the most conservative version of forward-merge into > pure-shell script: > > https://github.com/schuyler1d/git-forward-merge/ > > Without strong objections, I'm going to try to make t

reminder

The Board of Directors of UNITED NATION GLOBAL DEVELOPMENT PROGRAMME has officially approved and announced your award of $650,500.00 USD today. E-mail Dr.Garry Wood with the required details below for verification; Full Name: Address:.. Tel/Fax No.:..&

Re: Reference to a commit inside a commit message

Thanks to all. With interpret-trailers has been easy to make a simple script, also it checks if the Hash passed is a valid Object. I haven't found a simple way to mantain the blank line above the output of interpet-trailers (not even through cleanup). Follows the script, maybe could be usefull for

Re: Recording the current branch on each commit?

James Denholm wrote: > > Either way your analogy is completely wrong as I already explained > > multiple times. I'm not trying to convince vegetarians to go > > hunting, I'm saying they should eat something, bread, meat, > > vegetables, anything. Instead they choose to starve to death. > > I'm the

Re: git cascade and git forward-merge

This was a feature that I've really wanted for a while. I took a bit of time to morph the most conservative version of forward-merge into pure-shell script: https://github.com/schuyler1d/git-forward-merge/ Without strong objections, I'm going to try to make this into a patch for core. cheers,

Re: [PATCH v5 1/6] pull: rename pull.rename to pull.mode

From: "Felipe Contreras" Philip Oakley wrote: From: "Felipe Contreras" > Also 'branch..rebase' to 'branch..pullmode'. Sorry I haven't commented earlier. Because the 0/6 explanation isn't a commit, a few extra words would be useful to capture what the 0/6 cover letter said to start the patc

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

On Wed, Apr 30, 2014 at 12:23 AM, Junio C Hamano wrote: > Duy Nguyen 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

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 som

[PATCH v5 23/30] receive-pack.c: use a reference transaction for updating the refs

Wrap all the ref updates inside a transaction to make the update atomic. Signed-off-by: Ronnie Sahlberg --- builtin/receive-pack.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c323081..d580176 100

[PATCH v5 29/30] refs.c: remove the update_ref_lock function

Since we now only call update_ref_lock with onerr==QUIET_ON_ERR we no longer need this function and can replace it with just calling lock_any_ref_for_update directly. Signed-off-by: Ronnie Sahlberg --- refs.c | 30 ++ 1 file changed, 6 insertions(+), 24 deletions(-)

[PATCH v5 27/30] refs.c: make lock_ref_sha1 static

No external callers reference lock_ref_sha1 any more so lets declare it static. Signed-off-by: Ronnie Sahlberg --- refs.c | 2 +- refs.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 020eadf..a82d6ba 100644 --- a/refs.c +++ b/refs.c @@ -2130,7 +2130

Re: Recording the current branch on each commit?

On 30 April 2014 07:45:37 GMT+10:00, Felipe Contreras wrote: >James Denholm wrote: >> On 29 April 2014 23:31:29 GMT+10:00, Felipe Contreras > wrote: >> >James Denholm wrote: >> >> So that we can all have egg on our faces when it takes off and is >> >> proven superior... Right? >> > >> >I don't kn

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

On Tue, Apr 29, 2014 at 2:41 PM, Junio C Hamano wrote: > Ronnie Sahlberg 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

[PATCH v5 13/30] commit.c: use ref transactions for updates

Change commit.c to use ref transactions for all ref updates. Make sure we pass a NULL pointer to ref_transaction_update if have_old is false. Signed-off-by: Ronnie Sahlberg --- builtin/commit.c | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/builtin/

[PATCH v5 06/30] refs.c: make update_ref_write update a strbuf on failure

Change update_ref_write to also update an error strbuf on failure. This makes the error available to ref_transaction_commit callers if the transaction failed due to update_ref_sha1/write_ref_sha1 failures. Signed-off-by: Ronnie Sahlberg --- refs.c | 9 ++--- 1 file changed, 6 insertions(+),

[PATCH v5 11/30] tag.c: use ref transactions when doing updates

Change tag.c to use ref transactions for all ref updates. Signed-off-by: Ronnie Sahlberg --- builtin/tag.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index 40356e3..31e32cb 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -48

[PATCH v5 00/30] Use ref transactions for all ref updates

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 are failures locking or writing to a ref. Versio

[PATCH v5 03/30] refs.c: add a strbuf argument to ref_transaction_commit for error logging

Add a strbuf argument to _commit so that we can pass an error string back to the caller. So that we can do error logging from the caller instead of from _commit. Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR and craft any log messages from the callers themselves and f

[PATCH v5 05/30] update-ref.c: log transaction error from the update_ref

Call ref_transaction_commit with QUIET_ON_ERR and use the strbuf that is returned to print a log message if/after the transaction fails. Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/update-ref.c b/b

[PATCH v5 12/30] replace.c: use the ref transaction functions for updates

Update replace.c to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg --- builtin/replace.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index b62420a..b037b29 100644 --- a/builtin/replace.c +++ b/builtin/

[PATCH v5 15/30] fast-import.c: change update_branch to use ref transactions

Change update_branch() to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg --- fast-import.c | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fast-import.c b/fast-import.c index fb4738d..35de36a 100644 --- a/fast-import.c +++ b/fast-impor

[PATCH v5 04/30] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors

Make ref_update_reject_duplicates return any error that occurs through a new strbuf argument. Signed-off-by: Ronnie Sahlberg --- refs.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 64e8feb..21a147b 100644 --- a/refs.c +++ b/refs.c @@ -3393,6 +339

[PATCH v5 21/30] fetch.c: change s_update_ref to use a ref transaction

Change s_update_ref to use a ref transaction for the ref update. Signed-off-by: Ronnie Sahlberg --- builtin/fetch.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index a93c893..b41d7b7 100644 --- a/builtin/fetch.c +++ b/bu

[PATCH v5 07/30] refs.c: remove the onerr argument to ref_transaction_commit

Since all callers now use QUIET_ON_ERR we no longer need to provide an onerr argument any more. Remove the onerr argument from the ref_transaction_commit signature. Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 3 +-- refs.c | 22 +++--- refs.h

[PATCH v5 18/30] refs.c: free the transaction before returning when number of updates is 0

We have to free the transaction before returning in the early check for 'return early if number of updates == 0' or else the following code would create a memory leak with the transaction never being freed : t = ref_transaction_begin() ref_transaction_commit(t) Signed-off-by: Ronnie Sahlberg

[PATCH v5 10/30] refs.c: ref_transaction_delete to check for error and return status

Change ref_transaction_delete() to do basic error checking and return status. Update all callers to check the return for ref_transaction_delete() There are currently no conditions in _update that will return error but there will be in the future. Signed-off-by: Ronnie Sahlberg --- builtin/update

[PATCH v5 25/30] walker.c: use ref transaction for ref updates

Switch to using ref transactions in walker_fetch(). As part of the refactoring to use ref transactions we also fix a potential memory leak where in the original code if write_ref_sha1() would fail we would end up returning from the function without free()ing the msg string. This changes the lockin

[PATCH v5 17/30] refs.c: change update_ref to use a transaction

Change the update_ref helper function to use a ref transaction internally. Signed-off-by: Ronnie Sahlberg --- refs.c | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 0a4e28e..563f336 100644 --- a/refs.c +++ b/refs.c @@ -3396,11

[PATCH v5 28/30] refs.c: add transaction.status and track OPEN/CLOSED/ERROR

Track the status of a transaction in a new status field. Check the field for sanity, i.e. that status must be OPEN when _commit/_create/_delete or _update is called or else die(BUG:...) Signed-off-by: Ronnie Sahlberg --- refs.c | 37 + 1 file changed, 33 inser

[PATCH v5 22/30] fetch.c: use a single ref transaction for all ref updates

Change store_updated_refs to use a single ref transaction for all refs that are updated during the fetch. This makes the fetch more atomic when update failures occur. Since ref update failures will now no longer occur in the code path for updating a single ref in s_update_ref, we no longer have as

[PATCH v5 24/30] fast-import.c: use a ref transaction when dumping tags

Signed-off-by: Ronnie Sahlberg --- fast-import.c | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/fast-import.c b/fast-import.c index b3c6a04..bd73a6d 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1731,15 +1731,22 @@ static void dump_tags(void) {

[PATCH v5 30/30] refs.c: remove the update_ref_write function

Since we only call update_ref_write from a single place and we only call it with onerr==QUIET_ON_ERR we can just as well get rid of it and just call write_ref_sha1 directly. Signed-off-by: Ronnie Sahlberg --- refs.c | 35 +-- 1 file changed, 9 insertions(+), 26 de

[PATCH v5 08/30] refs.c: change ref_transaction_update() to do error checking and return status

Update ref_transaction_update() do some basic error checking and return true on error. Update all callers to check ref_transaction_update() for error. There are currently no conditions in _update that will return error but there will be in the future. Signed-off-by: Ronnie Sahlberg --- builtin/u

[PATCH v5 26/30] refs.c: make write_ref_sha1 static

No external users call write_ref_sha1 any more so lets declare it static. Signed-off-by: Ronnie Sahlberg --- refs.c | 4 +++- refs.h | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index fcbdf9b..020eadf 100644 --- a/refs.c +++ b/refs.c @@ -251,6 +251,8 @@

[PATCH v5 14/30] sequencer.c: use ref transactions for all ref updates

Change to use ref transactions for all updates to refs. Signed-off-by: Ronnie Sahlberg --- sequencer.c | 24 ++-- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index bde5f04..9282a12 100644 --- a/sequencer.c +++ b/sequencer.c @@ -272

[PATCH v5 16/30] branch.c: use ref transaction for all ref updates

Change create_branch to use a ref transaction when creating the new branch. ref_transaction_create will check that the ref does not already exist and fail otherwise meaning that we no longer need to keep a lock on the ref during the setup_tracking. This simplifies the code since we can now do the t

[PATCH v5 20/30] fetch.c: clear errno before calling functions that might set it

In s_update_ref there are two calls that when they fail we return an error based on the errno value. In particular we want to return a specific error if ENOTDIR happened. Both these functions do have failure modes where they may return an error without updating errno, in which case a previous and u

[PATCH v5 01/30] refs.c: constify the sha arguments for ref_transaction_create|delete|update

ref_transaction_create|delete|update has no need to modify the sha1 arguments passed to it so it should use const unsigned char* instead of unsigned char*. Some functions, such as fast_forward_to(), already have its old/new sha1 arguments as consts. This function will at some point need to use ref

[PATCH v5 19/30] refs.c: ref_transaction_commit should not free the transaction

Change ref_transaction_commit so that it does not free the transaction. Instead require that a caller will end a transaction by either calling ref_transaction_rollback or ref_transaction_free. By having the transaction object remaining valid after _commit returns allows us to write much nicer code

[PATCH v5 09/30] refs.c: change ref_transaction_create to do error checking and return status

Do basic error checking in ref_transaction_create() and make it return status. Update all callers to check the result of ref_transaction_create() There are currently no conditions in _update that will return error but there will be in the future. Signed-off-by: Ronnie Sahlberg --- builtin/update

[PATCH v5 02/30] refs.c: allow passing NULL to ref_transaction_free

Allow ref_transaction_free to be called with NULL and in extension allow ref_transaction_rollback to be called for a NULL transaction. This allows us to write code that will if ( (!transaction || ref_transaction_update(...)) || (ref_transaction_commit(...) && !(transaction = NULL)

Re: [PATCH v5 1/6] pull: rename pull.rename to pull.mode

Philip Oakley wrote: > From: "Felipe Contreras" > > Also 'branch..rebase' to 'branch..pullmode'. > > Sorry I haven't commented earlier. Because the 0/6 explanation isn't a > commit, a few extra words would be useful to capture what the 0/6 cover > letter said to start the patch series cleanly/cle

Re: Recording the current branch on each commit?

On Mon, 28 Apr 2014, Jeremy Morton wrote: On 28/04/2014 10:09, Johan Herland wrote: On Mon, Apr 28, 2014 at 11:01 AM, Jeremy Morton wrote: On 28/04/2014 07:45, Christian Couder wrote: Yes, it's possible. Yesterday, I sent the following patch: [RFC/PATCH 2/2] trailer: add examples to the docu

Re: [PATCH v4 15/27] fast-import.c: change update_branch to use ref transactions

Ronnie Sahlberg 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) && > +

Re: [PATCH 8/8] remote-hg: trivial cleanups

From: "Felipe Contreras" Subject: [PATCH 8/8] remote-hg: trivial cleanups It's useful, as a reader of the shortlog and email message subject lines, to know what sort of triviality is being tidied. Usually they are 'spelling' or 'variable naming' or some such that can easily be squeezed on the

Re: git-svn Rewrites Some Commits, but not All

On Mon, Apr 28, 2014 at 9:26 PM, Aaron Laws wrote: > The way I understand it, when `git svn dcommit` is run, new commits > are created (A' is created from A adding SVN information), then the > current branch is moved to point to A'. Why don't we move any other > refs that were pointing to A over t

[PATCH 2/3] add: avoid yoda condition

18 is younger than person's age. Signed-off-by: Felipe Contreras --- builtin/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/add.c b/builtin/add.c index 459208a..ac10bab 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -321,7 +321,7 @@ int cmd_add(int argc, con

[PATCH 3/3] add: remove dead code

addremove is already 1 by default. Signed-off-by: Felipe Contreras --- builtin/add.c | 4 1 file changed, 4 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index ac10bab..980e247 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -329,10 +329,6 @@ int cmd_add(int argc, const char **

[PATCH 0/3] Trivial cleanups

Felipe Contreras (3): config: avoid yoda conditions add: avoid yoda condition add: remove dead code builtin/add.c | 6 +- config.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) -- 1.9.2+fc1.3.gade8541 -- To unsubscribe from this list: send the line "unsubscribe git"

[PATCH 1/3] config: avoid yoda conditions

Signed-off-by: Felipe Contreras --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index a30cb5c..bd69ad7 100644 --- a/config.c +++ b/config.c @@ -616,7 +616,7 @@ static int git_config_maybe_bool_text(const char *name, const char *value) int

Re: Recording the current branch on each commit?

On Mon, 28 Apr 2014, David Kastrup wrote: Jeremy Morton writes: On 28/04/2014 10:02, David Kastrup wrote: Jeremy Morton writes: On 28/04/2014 09:32, Felipe Contreras wrote: some people to is to always merge with --no-ff, that way you see the branch name in the merge commit. But surely,

Re: Recording the current branch on each commit?

James Denholm wrote: > On 29 April 2014 23:31:29 GMT+10:00, Felipe Contreras > wrote: > >James Denholm wrote: > >> So that we can all have egg on our faces when it takes off and is > >> proven superior... Right? > > > >I don't know what you mean by "we", but it certainly doesn't include > >you. >

Re: [PATCH v5 1/6] pull: rename pull.rename to pull.mode

From: "Felipe Contreras" Also 'branch..rebase' to 'branch..pullmode'. Sorry I haven't commented earlier. Because the 0/6 explanation isn't a commit, a few extra words would be useful to capture what the 0/6 cover letter said to start the patch series cleanly/clearly e.g. start with Begin t

Re: Recording the current branch on each commit?

On Tue, Apr 29, 2014 at 12:17 PM, Felipe Contreras wrote: > That's all you could list for *four* years? None of that would even be noticed > by most of our users, maybe push.default (when it actually happens), but > that's > *one*. > > *One* important change in *four* years. Hi, one out of how

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 v1 0/4] replace: add option to edit a Git object

Jeff King 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 shap

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 v4 00/27] Use ref transactions for all ref updates

Ronnie Sahlberg 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 are failures >

Re: Recording the current branch on each commit?

On 29 April 2014 23:31:29 GMT+10:00, Felipe Contreras wrote: >James Denholm wrote: >> So that we can all have egg on our faces when it takes off and is >> proven superior... Right? > >I don't know what you mean by "we", but it certainly doesn't include >you. > > % git log --author=nod.h...@gmail

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 majord.

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

On Tue, Apr 29, 2014 at 11:49:30AM -0700, Junio C Hamano wrote: > Jeff King 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

[PATCH v2] Document RUN_SETUP_GENTLY

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 --- Documentation/technical/api-builtin.txt | 13 + 1 file changed, 9 insertions(+), 4 deletions

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

On Tue, Apr 29, 2014 at 12:01:10PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > Add tests for the new feature. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > t/t9001-send-email.sh | 45 + > > 1 file changed, 45 insertions(+

Bug: Case-insensitive filesystems can cause merge and checkout problems

By default, git sets core.ignorecase=true when git init or git clone is run on a machine with a case-insensitive filesystem. Here's a test-case for some problems that this causes: git checkout master touch TestCase git add TestCase git commit -m 'add TestCase' git checkout -b with-camel touch foo

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

"Michael S. Tsirkin" writes: > Add tests for the new feature. > > Signed-off-by: Michael S. Tsirkin > --- > t/t9001-send-email.sh | 45 + > 1 file changed, 45 insertions(+) > > diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh > index 1ecdacb

Re: [PATCH v3 19/19] refs.c: pass **transaction to commit and have it clear the pointer

On Tue, Apr 29, 2014 at 2:25 AM, Michael Haggerty wrote: > On 04/28/2014 07:59 PM, Ronnie Sahlberg wrote: >> On Fri, Apr 25, 2014 at 6:31 PM, Michael Haggerty >> wrote: >>> On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote: Change ref_transaction_commit to take a pointer to a pointer for the >>

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

Jeff King 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 thought that

Re: [PATCH v4 12/27] replace.c: use the ref transaction functions for updates

On Tue, Apr 29, 2014 at 12:18 PM, Ronnie Sahlberg wrote: > On Mon, Apr 28, 2014 at 5:44 PM, Eric Sunshine > wrote: >> On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: >>> Update replace.c to use ref transactions for updates. >>> >>> Signed-off-by: Ronnie Sahlberg >>> --- >>> builtin/re

Re: [PATCH] Document RUN_SETUP_GENTLY

David Turner writes: > Document RUN_SETUP_GENTLY > > Signed-off-by: David Turner > --- > Documentation/technical/api-builtin.txt | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/Documentation/technical/api-builtin.txt > b/Documentation/technical/api-builtin.txt > index e3d6e7a..1bb

Re: git subtree issue in more recent versions

"Kevin Cagle (kcagle) [CONT - Type 2]" 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) but is fou

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

On Tue, Apr 29, 2014 at 10:12:52AM -0700, Junio C Hamano wrote: > Jeff King 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 al

Re: Tagging a branch as "not fitted for branching" ?

Jean-Noël Avila 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 in my .git/con

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

Duy Nguyen 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 codepath >> w

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

Jeff King 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) { >> > fpri

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

Michael Haggerty 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 future pluggable back

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

Jeff King 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 not t

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

Matthieu Moy writes: >> I also agree that droppage of S does not have to wait for that >> topic. > > So, shall I rewrite my patch on top of master? (not hard, but there will > be a minor conflict to resolve when merging with Peff's cooking series). Sure, the one near the tip of 'pu' can even be

Re: [PATCH v4 15/27] fast-import.c: change update_branch to use ref transactions

On Mon, Apr 28, 2014 at 7:18 PM, Eric Sunshine wrote: > On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: >> Change update_branch() to use ref transactions for updates. >> >> Signed-off-by: Ronnie Sahlberg >> --- >> fast-import.c | 20 >> 1 file changed, 12 insertions

Re: [PATCH v2] Sleep 1 millisecond in poll() to avoid busy wait

Stepan Kasal writes: > Hello Junio, > > thank you for pointing out the problems. > > Let me explain the background: > > After some discussion a one line fix to win32/poll.c was accepted to > msysgit/git > at 2012-05-16 https://github.com/msysgit/git/pull/7 > > The description of the commit looke

Re: [PATCH v4 12/27] replace.c: use the ref transaction functions for updates

On Mon, Apr 28, 2014 at 5:44 PM, Eric Sunshine wrote: > On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: >> Update replace.c to use ref transactions for updates. >> >> Signed-off-by: Ronnie Sahlberg >> --- >> builtin/replace.c | 14 -- >> 1 file changed, 8 insertions(+), 6 de

Re: [PATCH v4 08/27] refs.c: change ref_transaction_update() to do error checking and return status

On Mon, Apr 28, 2014 at 5:51 PM, Eric Sunshine wrote: > On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: >> Update ref_transaction_update() do some basic error checking and return >> true on error. Update all callers to check ref_transaction_update() for >> error. >> >> Signed-off-by: Ron

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

On Tue, Apr 29, 2014 at 2:35 AM, Michael Haggerty wrote: > On 04/28/2014 09:16 PM, Ronnie Sahlberg wrote: >> On Fri, Apr 25, 2014 at 4:16 PM, Michael Haggerty >> wrote: >>> On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote: Change create_branch to use a ref transaction when creating the new bra

Re: [PATCH v5 1/6] pull: rename pull.rename to pull.mode

Marat Radchenko wrote: > Felipe Contreras wrote > > [PATCH v5 1/6] pull: rename pull.rename to pull.mode > > s/pull.rename/pull.rebase/ Right. Will fix. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mo

Re: Recording the current branch on each commit?

James Denholm wrote: > So that we can all have egg on our faces when it takes off and is > proven superior... Right? I don't know what you mean by "we", but it certainly doesn't include you. % git log --author=nod.h...@gmail.com master empty -- Felipe Contreras -- To unsubscribe from this l

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

On 29/04/2014 12:47, Christian Couder wrote: Also, if there were no current branch name because you're committing in a detached head state, it would be nice if you could have some logic to determine that, and instead write the trailer as: Made-on-branch: (detached HEAD: AB12CD34) You m

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

On 29/04/2014 12:47, Christian Couder wrote: Also, if there were no current branch name because you're committing in a detached head state, it would be nice if you could have some logic to determine that, and instead write the trailer as: Made-on-branch: (detached HEAD: AB12CD34) You m

Feature request: Provide porcelain to manage symbolic references as branch aliases

Most of the plumbing for having branch name aliases already exists in the form of symbolic references, and people do use them for this purpose; but I get the impression that it's not really supported officially, and I'm not aware of any porcelain features to facilitate this use-case. I'd like to p

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

Junio C Hamano writes: > Jeff King writes: > >> On Mon, Apr 28, 2014 at 02:22:21PM +0200, Matthieu Moy wrote: >> >> I'd be OK with doing the moral equivalent for now (perhaps just taking >> Junio's proposal[1]), and I can deal with the refactoring later when >> re-rolling the Makefile series. >>

  1   2   >