[PATCH v4 0/5] git-remote-mediawiki: new tool to preview local changes without pushing

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr The #7 issue on git-mediawiki's issue tracker [1] states that the ability to preview content without pushing would be a nice thing to have. changes from v3: - Rewrite all commit messages. - No more \ No newline at end of file. - Rename

[PATCH v4 2/5] git-remote-mediawiki: new git bin-wrapper for developement

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr The introduction of the Git::Mediawiki package makes it impossible to test, without installation, git-remote-mediawiki and git-mw. Using a git bin-wrapper enables us to define proper $GITPERLLIB to force the use of the developement version of the

[PATCH v4 1/5] git-remote-mediawiki: Introduction of Git::Mediawiki.pm

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr Currently, the mw-to-git project contains only a remote helper (git-remote-mediawiki.perl). To inmprove the user experience while working with mediawiki remotes, new tools, designed for such cases, should be created. To achieve this goal, the project

[PATCH v4 5/5] git-remote-mediawiki: Add preview subcommand into git mw.

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr In the current state, a user of git-remote-mediawiki can edit the markup text locally, but has to push to the remote wiki to see how the page is rendererd. Add a new 'git mw preview' command that allows rendering the markup text on the remote wiki

[PATCH v4 3/5] git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr For now, Git::Mediawiki contains nothing. This first patch moves some of git-remote-mediawiki.perl's factorisable code into Git::Mediawiki. In the same time, it removes the side effects of that code and renames the fucntions and constants moved to

[PATCH v4 4/5] git-remote-mediawiki: Adding git-mw command

2013-06-20 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr For now, git-remote-mediawiki is only a remote-helper. This patch adds a new toolset script in which we will be able to build new tools for git-remote-mediawiki. This toolset uses a subcommand-mechanism to launch the proper action. For now only the

Re: [PATCH 2/6] config doc: rewrite push.default section

2013-06-20 Thread Johan Herland
On Thu, Jun 20, 2013 at 5:27 AM, Junio C Hamano gits...@pobox.com wrote: +* `simple` - a safer version of `current`; push the current branch + to update a branch with the same name on the receiving end, with a + safety feature: in central workflows, error out if your current + branch is not

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Michael Haggerty
On 06/19/2013 09:18 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: Handle simple transactions for the packed-refs file at the packed_ref_cache level via new functions lock_packed_refs(), commit_packed_refs(), and rollback_packed_refs(). Only allow the packed ref

Re: [PATCH] status: display the SHA1 of the commit being currently processed

2013-06-20 Thread Peter Krefting
Junio C Hamano: But my understanding is that the reordering using printf() is the mechanism we suggest l10n folks to use when the order of parameters given to printf does not match the preferred word order in the message in their language. It's documented in the gettext manual, and seems to

Re: [PATCH] status: display the SHA1 of the commit being currently processed

2013-06-20 Thread Johannes Sixt
Am 6/20/2013 9:56, schrieb Peter Krefting: Junio C Hamano: But my understanding is that the reordering using printf() is the mechanism we suggest l10n folks to use when the order of parameters given to printf does not match the preferred word order in the message in their language. It's

[PATCH] send-email: Fix documentation of --signed-off-by-cc option

2013-06-20 Thread Namhyung Kim
From: Namhyung Kim namhyung@lge.com The man page says it'll control the Cc: lines being added also, but this is not true. Reported-by: Minchan Kim minc...@kernel.org Signed-off-by: Namhyung Kim namhyung@lge.com --- Documentation/git-send-email.txt | 2 +- 1 file changed, 1 insertion(+),

Re: [PATCH v4 1/5] git-remote-mediawiki: Introduction of Git::Mediawiki.pm

2013-06-20 Thread Matthieu Moy
This serie has a conflict with cm/remote-mediawiki. We probably want to wait for other mediawiki patch series to hit master (they are all marked as will merge to master in Junio's last what's cooking) before merging this one. benoit.per...@ensimag.fr writes: From: Benoit Person

[PATCH v3 11/12] for_each_ref: load all loose refs before packed refs

2013-06-20 Thread Michael Haggerty
From: Jeff King p...@peff.net If we are iterating through the refs using for_each_ref (or any of its sister functions), we can get into a race condition with a simultaneous pack-refs --prune that looks like this: 0. We have a large number of loose refs, and a few packed refs.

[PATCH v3 12/12] refs: do not invalidate the packed-refs cache unnecessarily

2013-06-20 Thread Michael Haggerty
Now that we keep track of the packed-refs file metadata, we can detect when the packed-refs file has been modified since we last read it, and we do so automatically every time that get_packed_ref_cache() is called. So there is no need to invalidate the cache automatically when lock_packed_refs()

[PATCH v3 06/12] do_for_each_entry(): increment the packed refs cache refcount

2013-06-20 Thread Michael Haggerty
This function calls a user-supplied callback function which could do something that causes the packed refs cache to be invalidated. So acquire a reference count on the data structure to prevent our copy from being freed while we are iterating over it. Signed-off-by: Michael Haggerty

[PATCH v3 10/12] get_packed_ref_cache: reload packed-refs file when it changes

2013-06-20 Thread Michael Haggerty
From: Jeff King p...@peff.net Once we read the packed-refs file into memory, we cache it to save work on future ref lookups. However, our cache may be out of date with respect to what is on disk if another process is simultaneously packing the refs. Normally it is acceptable for us to be a little

[PATCH v3 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Michael Haggerty
Handle simple transactions for the packed-refs file at the packed_ref_cache level via new functions lock_packed_refs(), commit_packed_refs(), and rollback_packed_refs(). Only allow the packed ref cache to be modified (via add_packed_ref()) while the packed refs file is locked. Change clone to

[PATCH v3 09/12] add a stat_validity struct

2013-06-20 Thread Michael Haggerty
It can sometimes be useful to know whether a path in the filesystem has been updated without going to the work of opening and re-reading its content. We trust the stat() information on disk already to handle index updates, and we can use the same trick here. This patch introduces a stat_validity

[PATCH v3 07/12] packed_ref_cache: increment refcount when locked

2013-06-20 Thread Michael Haggerty
Increment the packed_ref_cache reference count while it is locked to prevent its being freed. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index f33d224..a5a5b5d 100644 --- a/refs.c +++

[PATCH v3 08/12] Extract a struct stat_data from cache_entry

2013-06-20 Thread Michael Haggerty
Add public functions fill_stat_data() and match_stat_data() to work with it. This infrastructure will later be used to check the validity of other types of file. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- builtin/ls-files.c | 12 +++-- cache.h| 33 +---

[PATCH v3 05/12] refs: manage lifetime of packed refs cache via reference counting

2013-06-20 Thread Michael Haggerty
In struct packed_ref_cache, keep a count of the number of users of the data structure. Only free the packed ref cache when the reference count goes to zero rather than when the packed ref cache is cleared. This mechanism will be used to prevent the cache data structure from being freed while it

[PATCH v3 03/12] refs: wrap the packed refs cache in a level of indirection

2013-06-20 Thread Michael Haggerty
As we know, we can solve any problem in this manner. In this case, the problem is to avoid freeing a packed refs cache while somebody is using it. So add a level of indirection as a prelude to reference-counting the packed refs cache. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu ---

[PATCH v3 00/12] Fix some reference-related races

2013-06-20 Thread Michael Haggerty
v3 of mh/ref-races. Thanks to Junio for the suggestion implemented in this version. Change since v2: * Change lock_packed_refs() to use its own struct lock_file rather than requiring the caller to supply its own. Please note that this patch series's usage of stat()/fstat() causes breakages

[PATCH v3 01/12] repack_without_ref(): split list curation and entry writing

2013-06-20 Thread Michael Haggerty
The repack_without_ref() function first removes the deleted ref from the internal packed-refs list, then writes the packed-refs list to disk, omitting any broken or stale entries. This patch splits that second step into multiple passes: * collect the list of refnames that should be deleted from

Re: [PATCH v4 5/5] git-remote-mediawiki: Add preview subcommand into git mw.

2013-06-20 Thread Matthieu Moy
benoit.per...@ensimag.fr writes: +# @TODO : add documentation for verbose option I guess that's not applicable anymore. +distant mediawiki and combined with a template retrieved from the mediawiki. s/distant/remote/ +sub preview { + my $wiki; + my ($remote_url, $wiki_page_name);

Re: [PATCH v4 0/5] git-remote-mediawiki: new tool to preview local changes without pushing

2013-06-20 Thread Matthieu Moy
benoit.per...@ensimag.fr writes: From: Benoit Person benoit.per...@ensimag.fr The #7 issue on git-mediawiki's issue tracker [1] states that the ability to preview content without pushing would be a nice thing to have. I make minor remarks, but on overall, the code looks good. -- Matthieu

Re: [PATCH v2 00/12] Fix some reference-related races

2013-06-20 Thread Michael Haggerty
On 06/19/2013 08:56 PM, Jeff King wrote: On Wed, Jun 19, 2013 at 09:51:21AM +0200, Michael Haggerty wrote: Re-roll of mh/ref-races. Thanks to Peff, Junio, and Ramsay for reviewing v1. Thanks. I just read through them again. Everything looks good to me. Patches 10 and 11 are missing my

[PATCH v5 0/5] Reroll patches against v1.8.3.1

2013-06-20 Thread Alexey Shumkin
Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected outputs t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs pretty: Add failing tests: user format ignores i18n.logOutputEncoding

[PATCH v5 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 142 + 1 file changed, 79 insertions(+), 63 deletions(-) diff --git

[PATCH v5 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git

[PATCH v5 5/5] pretty: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Alexey Shumkin
The following two commands are expected to give the same output to a terminal: $ git log --oneline --no-color $ git log --pretty=format:'%h %s' However, the former pays attention to i18n.logOutputEncoding configuration, while the latter does not when it format %s. Log messages

[PATCH v5 2/5] t7102 (reset): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index

[PATCH v5 4/5] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Alexey Shumkin
The following two commands are expected to give the same output to a terminal: $ git log --oneline --no-color $ git log --pretty=format:'%h %s' However, the former pays attention to i18n.logOutputEncoding configuration, while the latter does not when it format %s. Log messages

Re: [PATCH v4 5/5] git-remote-mediawiki: Add preview subcommand into git mw.

2013-06-20 Thread Matthieu Moy
benoit.per...@ensimag.fr writes: + for (@{ $html_tree-extract_links() }) { + my ($link, $element, $attr) = @{ $_ }; + my $url = url($link)-canonical; + $element-attr($attr, URI-new_abs($url, $remote_url)); Actually, this breaks some relative links,

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Decouple `simple` from `upstream` completely, and change it to mean `current` with a safety feature: a `push` and `pull` should not be asymmetrical in the special case of central workflows. Double negation confused my parser. 'push' and 'pull' should be kept

Splitting a rev list into 2 sets

2013-06-20 Thread Francis Moreau
Hello, I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that git-rev-list would accept. This script should consider commits in master differently than the ones in others branches. To get the commit set which can't be

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-20 Thread Ramkumar Ramachandra
Richard Hansen wrote: In the meantime, I'll rework the patch series to avoid using the word ref when defining committish and tree-ish. This is a good way forward. I'm curious about what you're planning on substituting it with though: the extended SHA-1 expression that Jonathan hinted at? --

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-20 Thread Ramkumar Ramachandra
Richard Hansen wrote: * Aren't HEAD, FETCH_HEAD, ORIG_HEAD also refs? HEAD is a symbolic ref [*1*], FETCH_HEAD is not a ref [*2*], and ORIG_HEAD is a ref. ref A binding of a name to an object or other ref (in which case it is a symref). Refs are stored in the

Re: [PATCH v4 0/5] git-remote-mediawiki: new tool to preview local changes without pushing

2013-06-20 Thread Benoît Person
Ok, thanks for all the reviews, Final version (I hope :) ) will come when all the mediawiki patches will have graduated to 'master' then. Benoit Person -- 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 v2 00/12] Fix some reference-related races

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 11:09:49AM +0200, Michael Haggerty wrote: If the packed-refs file is already locked by another process (and there is no reason why that cannot be, and there is only one attempt to acquire the lock), then repack_without_ref() emits an error and returns with an error

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 09:49:51AM +0200, Michael Haggerty wrote: [I just noticed that lock_ref_sha1_basic() leaks a struct lock_file every time that it is called.] I noticed that recently, too. I have a patch series about 90% complete that abstracts the tempfile handling (the ultimate goal of

[PATCH v2 1/2] send-email: sanitize author when writing From line

2013-06-20 Thread Michael S. Tsirkin
sender is now sanitized, but we didn't sanitize author when checking whether From: line is needed in the message body. As a result git started writing duplicate From lines when author matched sender and has utf8 characters. Reported-by: SZEDER Gábor sze...@ira.uka.de Tested-by: SZEDER Gábor

[PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Michael S. Tsirkin
Verify that author name is not duplicated if it matches sender, even if it is in utf8. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index

[PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16). It thus did not initially deal with uncommitted changes in the unborn branch. The case of an _unstaged_

Re: [PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Thomas Rast
Michael S. Tsirkin m...@redhat.com writes: Verify that author name is not duplicated if it matches sender, even if it is in utf8. Small nit: if you make two patches out of it, add the tests first with test_expect_failure. Then flip it to test_expect_success in the actual code change. That

Re: [PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Michael S. Tsirkin
On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote: Michael S. Tsirkin m...@redhat.com writes: Verify that author name is not duplicated if it matches sender, even if it is in utf8. Small nit: if you make two patches out of it, add the tests first with test_expect_failure.

Re: [PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Thomas Rast
Michael S. Tsirkin m...@redhat.com writes: On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote: Michael S. Tsirkin m...@redhat.com writes: Verify that author name is not duplicated if it matches sender, even if it is in utf8. Small nit: if you make two patches out of it, add

Re: [PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 02:36:03PM +0200, Thomas Rast wrote: The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16). It thus did not initially deal with

Re: [PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Michael S. Tsirkin
On Thu, Jun 20, 2013 at 02:48:15PM +0200, Thomas Rast wrote: Michael S. Tsirkin m...@redhat.com writes: On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote: Michael S. Tsirkin m...@redhat.com writes: Verify that author name is not duplicated if it matches sender, even if it

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Phil Hord
On Thu, Jun 20, 2013 at 6:14 AM, Francis Moreau francis.m...@gmail.com wrote: I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that git-rev-list would accept. This script should consider commits in master differently

[PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16). It thus did not initially deal with uncommitted changes in the unborn branch. The case of an _unstaged_

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Francis Moreau
On Thu, Jun 20, 2013 at 1:26 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Francis Moreau wrote: To get the commit set which can't be reached by master (ie commits which are specific to branches other than master) I would do: # $@ is the range spec passed to the script git rev-list

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 03:06:01PM +0200, Thomas Rast wrote: +test_expect_success 'pulling into void does not overwrite staged files' ' + git init cloned-staged-colliding + ( + cd cloned-staged-colliding + echo alternate content file + git add

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Francis Moreau
Hi, On Thu, Jun 20, 2013 at 3:04 PM, Phil Hord phil.h...@gmail.com wrote: On Thu, Jun 20, 2013 at 6:14 AM, Francis Moreau francis.m...@gmail.com wrote: I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that

[BUG] clone: regression in error messages in master

2013-06-20 Thread Ramkumar Ramachandra
Hi, So this should explain the problem: # using v1.8.3.1 $ git clone https://google.com Cloning into 'google.com'... fatal: repository 'https://google.com/' not found # using master $ git clone https://google.com Cloning into 'google.com'... fatal: repository

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
Jeff King p...@peff.net writes: On Thu, Jun 20, 2013 at 03:06:01PM +0200, Thomas Rast wrote: +test_expect_success 'pulling into void does not overwrite staged files' ' +git init cloned-staged-colliding +( +cd cloned-staged-colliding +echo alternate content

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Thomas Rast
Francis Moreau francis.m...@gmail.com writes: Hello, I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that git-rev-list would accept. This script should consider commits in master differently than the ones in

Re: [Request] Git reset should be able to ignore file permissions

2013-06-20 Thread Alexander Nestorov
@Matthieu Ok, I'm replacing with Reset only files which actually changed (not those with only stat information change) @Junio I'm not sure what you're asking, sorry, I'm not able to understand your question. -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
Thomas Rast tr...@inf.ethz.ch writes: Jeff King p...@peff.net writes: On Thu, Jun 20, 2013 at 03:06:01PM +0200, Thomas Rast wrote: +test_expect_success 'pulling into void does not overwrite staged files' ' + git init cloned-staged-colliding + ( + cd cloned-staged-colliding

Re: [BUG] clone: regression in error messages in master

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 06:46:55PM +0530, Ramkumar Ramachandra wrote: So this should explain the problem: # using v1.8.3.1 $ git clone https://google.com Cloning into 'google.com'... fatal: repository 'https://google.com/' not found # using master $ git clone

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 03:33:34PM +0200, Thomas Rast wrote: I naively would have expected this to leave us in a conflicted state over file. But I guess read-tree just rejects it, because we are not doing a real three-way merge. I'm not sure it is that big a deal; this is more about

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Ramkumar Ramachandra
Francis Moreau wrote: Basically I have an initial set (or can be several different sets) expressed as a revision specification described by git-rev-list man page. I just want to find the common set of commit which are part of the initial sets *and* is reachable by master. That's just a

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
Thomas Rast tr...@inf.ethz.ch writes: if test -z $orig_head then git update-ref -m initial pull HEAD $merge_head $curr_head - git read-tree -m -u HEAD || exit 1 + # Two-way merge: we claim the index is based on an empty tree, + # and try to fast-forward to HEAD. This

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Thomas Rast
Jeff King p...@peff.net writes: On Thu, Jun 20, 2013 at 03:33:34PM +0200, Thomas Rast wrote: I naively would have expected this to leave us in a conflicted state over file. But I guess read-tree just rejects it, because we are not doing a real three-way merge. I'm not sure it is that

[PATCH] t7400: test of UTF-8 submodule names pass under Mac OS

2013-06-20 Thread Torsten Bögershausen
submodules with names using UTF-8 need core.precomposeunicode true under Mac OS X, set it in the TC. Improve the portability: Not all shells on all OS may understand literal UTF-8 strings. Use a help variable filled by printf, as we do it in e.g. t0050. strange names can be called UTF-8,

Daily deb/rpm builds of git

2013-06-20 Thread Dennis Kaarsemaker
Hi all, To make it easier to help test changes that are in-flight, I've started using and publishing daily snapshots of -next as packages for Ubuntu 12.10, 13.04 and 13.10, Debian 7.0 and Fedora 17 and 18. If anyone else wants to use these, they can be found on launchpad and openSUSE's build

Re: [PATCH] pull: pull into void by fast-forwarding from empty tree

2013-06-20 Thread Ramkumar Ramachandra
Thomas Rast wrote: diff --git a/git-pull.sh b/git-pull.sh index 638aabb..1f84383 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -266,10 +266,17 @@ case $merge_head in ;; esac +# Pulling into unborn branch: a shorthand for branching off +# FETCH_HEAD, for lazy typers. if test -z

Re: Splitting a rev list into 2 sets

2013-06-20 Thread Francis Moreau
Hi, On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast tr...@inf.ethz.ch wrote: Francis Moreau francis.m...@gmail.com writes: But I'm wondering if someone can see another solution more elegant ? I think there's a cute way. Suppose your arguments are of the form Really nice ! p1 p2 ... --not

Re: [PATCH] send-email: Fix documentation of --signed-off-by-cc option

2013-06-20 Thread Ramkumar Ramachandra
Namhyung Kim wrote: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 40a9a9a..5694d98 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -238,7 +238,7 @@ Automating the value of 'sendemail.identity'.

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: But currently only the main packed ref cache can be locked, so it would be possible for lock_packed_refs() to use the static packlock instance for locking. Perhaps I am missing something from the previous discussions, but I am having trouble

Re: [PATCH] peel_onion(): add support for rev^{tag}

2013-06-20 Thread Ramkumar Ramachandra
Richard Hansen wrote: --- a/sha1_name.c +++ b/sha1_name.c @@ -677,6 +677,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) sp++; /* beginning of type name, or closing brace for empty */ if (!strncmp(commit_type, sp, 6) sp[6] == '}')

[no subject]

2013-06-20 Thread Valerie Loans Ltd
Do you need a genuine Loan to settle your bills and start up a good business? Kindly contact us now with your details to get a secured Loan at a low rate of 2% per Annu, Quick send your details via: stella.fina...@usa.com -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Michael Haggerty
On 06/20/2013 07:11 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: But currently only the main packed ref cache can be locked, so it would be possible for lock_packed_refs() to use the static packlock instance for locking. Perhaps I am missing something from the

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Michael Haggerty
On 06/20/2013 01:55 PM, Jeff King wrote: On Thu, Jun 20, 2013 at 09:49:51AM +0200, Michael Haggerty wrote: [I just noticed that lock_ref_sha1_basic() leaks a struct lock_file every time that it is called.] I noticed that recently, too. I have a patch series about 90% complete that

Re: [PATCH] peel_onion(): add support for rev^{tag}

2013-06-20 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: Barfing on non-tags is the feature this adds. It's otherwise useless, just like object^{object} is useless except to barf when object doesn't exist. Thanks. I could buy that. And after re-reading the proposed log message, you do not quite have

Re: [PATCH] status: display the SHA1 of the commit being currently processed

2013-06-20 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 6/20/2013 9:56, schrieb Peter Krefting: Junio C Hamano: But my understanding is that the reordering using printf() is the mechanism we suggest l10n folks to use when the order of parameters given to printf does not match the preferred word

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 06/20/2013 07:11 PM, Junio C Hamano wrote: Perhaps I am missing something from the previous discussions, but I am having trouble understanding the main packed ref cache part of the above. main as opposed to...? main as opposed to submodule.

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16). It thus did not initially deal with uncommitted changes in the

Re: [PATCH] t7400: test of UTF-8 submodule names pass under Mac OS

2013-06-20 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: submodules with names using UTF-8 need core.precomposeunicode true under Mac OS X, set it in the TC. I take that TC stands for test case? +test_expect_success 'submodule with UTF-8 name' ' + mkdir $svname ( - cd å äö +

Re: [PATCH v2 2/2] send-email: add test for duplicate utf8 name

2013-06-20 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Verify that author name is not duplicated if it matches sender, even if it is in utf8. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Hmph. There seems to be something wrong in the original message I received from you (look at Cc: line I

Re: Feature request: fetch --prune by default

2013-06-20 Thread Sam Roberts
I would use the config feature to turn on --prune for fetch, and was surprised that it wasn't available - I hit this thread because I figured I somehow missed it in the config docs. Having both global and local settings seems nice. -- View this message in context:

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Decouple `simple` from `upstream` completely, and change it to mean `current` with a safety feature: a `push` and `pull` should not be asymmetrical in the special case of central workflows. Double negation confused my

Re: [PATCH v2 4/4] log: --author-date-order

2013-06-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: Or we could extend parse_commit() API to take an optional commit info slab to store not just author date but other non-essential stuff like people's names, and we arrange that extended API to be triggered when we know --author-date-order is in effect? I like

Re: [PATCH v2 04/12] refs: implement simple transactions for the packed-refs file

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 08:03:43PM +0200, Michael Haggerty wrote: I noticed that recently, too. I have a patch series about 90% complete that abstracts the tempfile handling (the ultimate goal of which is to optionally clean up tmp_* files in the objects/ directory). It refactors the

Re: [PATCH 1/3] rebase: guard against missing files in read_basic_state()

2013-06-20 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: On Thu, Jun 13, 2013 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote: Ramkumar Ramachandra artag...@gmail.com writes: A more troublesome is that nobody seems to check the return value of this function. If head-name, onto or orig-head is

Re: [PATCH v5 0/5] Reroll patches against v1.8.3.1

2013-06-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected outputs t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs pretty: Add failing tests:

Re: [PATCH v2 4/4] log: --author-date-order

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 12:36:21PM -0700, Junio C Hamano wrote: I like the latter option. It takes a non-trivial amount of time to load the commits from disk, and now we are potentially doing it 2 or 3 times for a run (once to parse, once to get the author info for topo-sort, and possibly

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 11:43:37AM -0700, Junio C Hamano wrote: Thomas Rast tr...@inf.ethz.ch writes: The logic for pulling into an unborn branch was originally designed to be used on a newly-initialized repository (d09e79c, git-pull: allow pulling into an empty repository, 2006-11-16).

Re: [PATCH v5 5/5] pretty: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: Subject: Re: [PATCH v5 5/5] pretty: user format ignores i18n.logOutputEncoding setting That is a statement of fact, and does not tell much to the reader. I think you are saying that in the current implementation, logoutputencoding is not honored in

Re: [PATCH v5 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 142 + 1 file

Re: [PATCH v5 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file

Re: [PATCH v5 4/5] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Junio C Hamano
Alexey Shumkin alex.crez...@gmail.com writes: @@ -19,7 +23,8 @@ add_file () { echo $name $name git add $name test_tick - git commit -m Add $name || exit + msg_added_iso88595=$(echo

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: Perhaps making sure the index is empty is sufficient, then? That would not let you pull when you have foo staged, but upstream does not have foo at all. To be fair, that is quite a corner case, and simply rejecting the pull entirely may be OK. That simplicity

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Thursday, June 20, 2013 8:23 PM Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Decouple `simple` from `upstream` completely, and change it to mean `current` with a safety feature: a `push` and `pull` should not be

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

2013-06-20 Thread Jeff King
On Thu, Jun 20, 2013 at 01:49:13PM -0700, Junio C Hamano wrote: But read-tree already does the hard work for us, so I don't think it is a lot of code either way. OK, I just got an impression from reading the back-and-forth between you two that read-tree does not want to deal with that

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Thursday, June 20, 2013 8:23 PM Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Double negation confused my parser. 'push' and 'pull' should be kept symmetrical in central

Re: [PATCH 2/2] Move sequencer to builtin

2013-06-20 Thread Thiago Farina
May be because they (LKM) are more open to such architectural and organization refactorings? Some maintainers, like Greg Kroah-Hartman and possibly others accept clean up patches, such thing seems to be unacceptable here on git. Looks like there is space here only for features and bug fixes.

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Ramkumar Ramachandra
Junio C Hamano wrote: They're not the same thing. It is very much intentional and intended: the safety net is not to ensure that the push and pull are symmetrical (i.e. among other things, error out if branch.$branch.merge is unset), but rather ensure that the push and pull are never

[BUG?] remote prune origin interacts badly with clone --mirror and multiple remotes

2013-06-20 Thread Dennis Kaarsemaker
[git version: next as of yesterday afternoon] If I clone a repo with git clone --mirror, and add other remotes later, 'git remote prune origin' deletes all branches and tags of the other remotes. Easily repeatable example: [core] repositoryformatversion = 0 filemode = true

Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows

2013-06-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: Without any configuration the current branch is pushed out, which loosens the safety we implemented in the current 'safer upstream'. I am not convinced this is a good change. I am not convinced this is a bad

  1   2   >