Re: [PATCH 5/5] rebase: fix cherry-pick invocations

2013-05-29 Thread Felipe Contreras
Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: So that all the tests pass. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 17 - 1 file changed, 16

Re: [RFC/PATCH v2 3/8] rebase: cherry-pick: fix sequence continuation

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 12:51 AM, Martin von Zweigbergk martinv...@gmail.com wrote: On Tue, May 28, 2013 at 10:41 PM, Felipe Contreras felipe.contre...@gmail.com wrote: One change splits, the other change fixes, what's wrong with that? I didn't say there was anything wrong. I was asking if

Re: [RFC/PATCH v2 3/8] rebase: cherry-pick: fix sequence continuation

2013-05-29 Thread Martin von Zweigbergk
:-) On Tue, May 28, 2013 at 11:05 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 12:51 AM, Martin von Zweigbergk martinv...@gmail.com wrote: On Tue, May 28, 2013 at 10:41 PM, Felipe Contreras felipe.contre...@gmail.com wrote: One change splits, the other

Re: [PATCH] completion: zsh: improve bash script loading

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 5:24, schrieb Felipe Contreras: +if [ -z $script ]; then + local -a locations + locations=( + '/etc/bash_completion.d/git' # fedora, old debian + '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian +

Re: [RFC/PATCH] patch-ids: check modified paths before calculating diff

2013-05-29 Thread Jeff King
On Sun, May 19, 2013 at 02:17:35PM +0100, John Keeping wrote: When using git cherry or git log --cherry-pick we often have a small number of commits on one side and a large number on the other. In revision.c::cherry_pick_list we store the patch IDs for the small side before comparing the

[PATCH] prompt: fix for simple rebase

2013-05-29 Thread Felipe Contreras
When we are rebasing without options ('am' mode), the head rebased lives in '$g/rebase-apply/head-name', so lets use that information so it's reported the same way as if we were doing other rebases (-i or -m). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: [PATCH] completion: zsh: improve bash script loading

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 1:17 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 5/29/2013 5:24, schrieb Felipe Contreras: +if [ -z $script ]; then + local -a locations + locations=( + '/etc/bash_completion.d/git' # fedora, old debian +

[PATCH v2 3/7] add tests for rebasing of empty commits

2013-05-29 Thread Martin von Zweigbergk
--- t/t3401-rebase-partial.sh | 24 t/t3420-rebase-topology-linear.sh | 58 +++ 2 files changed, 58 insertions(+), 24 deletions(-) diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 58f4823..7ba1797 100755 ---

[PATCH v2 6/7] t3406: modernize style

2013-05-29 Thread Martin von Zweigbergk
Update the following: - Quote 'setup' - Remove blank lines within test case body - Use test_commit instead of custom quick_one - Create branch topic from tag created by test_commit --- t/t3406-rebase-message.sh | 30 +- 1 file changed, 9 insertions(+), 21

[PATCH v2 1/7] add simple tests of consistency across rebase types

2013-05-29 Thread Martin von Zweigbergk
Helped-by: Johannes Sixt j...@kdbg.org --- t/lib-rebase.sh | 15 t/t3420-rebase-topology-linear.sh | 78 +++ 2 files changed, 93 insertions(+) create mode 100755 t/t3420-rebase-topology-linear.sh diff --git a/t/lib-rebase.sh

[PATCH v2 4/7] add tests for rebasing root

2013-05-29 Thread Martin von Zweigbergk
--- t/t3420-rebase-topology-linear.sh | 129 ++ 1 file changed, 129 insertions(+) diff --git a/t/t3420-rebase-topology-linear.sh b/t/t3420-rebase-topology-linear.sh index 40fe264..2429aa8 100755 --- a/t/t3420-rebase-topology-linear.sh +++

[PATCH v2 7/7] tests: move test for rebase messages from t3400 to t3406

2013-05-29 Thread Martin von Zweigbergk
t3406 is supposed to test messages from rebase operation, so let's move tests in t3400 that fit that description into 3406. Most of the functionality they tested, except for the messages, has now been subsumed by t3420. --- t/t3400-rebase.sh | 22 --

[PATCH v2 5/7] add tests for rebasing merged history

2013-05-29 Thread Martin von Zweigbergk
--- t/t3400-rebase.sh | 31 + t/t3401-rebase-partial.sh | 45 --- t/t3404-rebase-interactive.sh | 10 +- t/t3409-rebase-preserve-merges.sh | 53 t/t3425-rebase-topology-merges.sh | 250 ++ 5 files changed, 252

[PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Martin von Zweigbergk
--- t/lib-rebase.sh | 17 t/t3420-rebase-topology-linear.sh | 85 +++ 2 files changed, 102 insertions(+) diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 62b3887..16eeb1c 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@

[PATCH v2 0/7] Rebase topology test

2013-05-29 Thread Martin von Zweigbergk
After way too long, here is finally a new version of the tests I sent at: http://thread.gmane.org/gmane.comp.version-control.git/205796. I have split the test up into two files. They stil take quite some time to run. Martin von Zweigbergk (7): add simple tests of consistency across rebase

Retrieving a file at a before a specified commit

2013-05-29 Thread Erik de Castro Lopo
Hi all, I have a commit like this: commit 4d77a3cee01db0412956d40875c79f51ac745acc tree 3443c9f633114c3bd2e015453a8c55a171e62b53 parent 340d808ade8a79857bec40770f0eb4f98224c53d author committer . which modifies file A/B/C (ie specifically does not add, but changes

Re: [PATCH v2 0/7] Rebase topology test

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 1:39 AM, Martin von Zweigbergk martinv...@gmail.com wrote: After way too long, here is finally a new version of the tests I sent at: http://thread.gmane.org/gmane.comp.version-control.git/205796. I have split the test up into two files. They stil take quite some time

Re: [RFC/PATCH] patch-ids: check modified paths before calculating diff

2013-05-29 Thread Jeff King
On Wed, May 29, 2013 at 02:20:07AM -0400, Jeff King wrote: In the best case, we compute no patch-ids at all. And even for the average case, I'd expect our lazy calculation to only have to compute a handful of ids. Here is a not-well-tested version of the idea. I tried to contain the changes

Re: [PATCH v2 4/7] add tests for rebasing root

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: +test_run_rebase () { + result=$1 + shift + test_expect_$result rebase $* --onto --root with merge-base does not go to root + reset_rebase + git rebase $* --onto m --root g + test_cmp_rev

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

2013-05-29 Thread David Aguilar
On Tue, May 28, 2013 at 9:19 PM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 10:41 AM, Duy Nguyen pclo...@gmail.com wrote: The changes in this area since 1.8.2.3 seem to be Karsten's (I'm not blaming, just wanted to narrow down the problem). The patterns of interest seem to be

Re: [PATCH] completion: avoid ls-remote in certain scenarios

2013-05-29 Thread SZEDER Gábor
On Tue, May 28, 2013 at 10:20:48PM -0500, Felipe Contreras wrote: It's _very_ slow in many cases, and there's really no point in fetching *everything* from the remote just for completion. In many cases it might be faster for the user to type the whole thing. If the user manually specifies

Re: [RFC/PATCH] patch-ids: check modified paths before calculating diff

2013-05-29 Thread Jeff King
On Wed, May 29, 2013 at 03:22:25AM -0400, Jeff King wrote: revs=origin/master...origin/jk/submodule-subdirectory-ok stock|you |me --- real 0m0.501s | 0m0.078s | 0m0.098s user 0m0.480s | 0m0.056s | 0m0.084s sys 0m0.016s |

Re: [PATCH v2 5/7] add tests for rebasing merged history

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: +# a---b---c +# \ \ +# d---e \ +#\ \ \ +# n---o---w---v +# \ +# z +#TODO: make all flavors of rebase use --topo-order +test_run_rebase success 'e n o'

Re: Retrieving a file at a before a specified commit

2013-05-29 Thread Jeff King
On Wed, May 29, 2013 at 04:47:35PM +1000, Erik de Castro Lopo wrote: I have a commit like this: commit 4d77a3cee01db0412956d40875c79f51ac745acc tree 3443c9f633114c3bd2e015453a8c55a171e62b53 parent 340d808ade8a79857bec40770f0eb4f98224c53d author committer .

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Thomas Rast
Felipe Contreras felipe.contre...@gmail.com writes: Thomas Rast wrote: Junio C Hamano gits...@pobox.com writes: Thomas Rast Cc'ed as he has been the primary force behind this line of notes usability. Thanks for pointing this out to me. Felipe Contreras felipe.contre...@gmail.com

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 3:09 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: Feel free to implement that. I'm just interested in 'git cherry-pick' being usable for 'git rebase' purposes. Which would have been obvious to all but the most casual

Re: [PATCH v2 22/25] string_list_add_refs_by_glob(): add a comment about memory management

2013-05-29 Thread Thomas Rast
Michael Haggerty mhag...@alum.mit.edu writes: Since string_list_add_one_ref() adds refname to the string list, but the lifetime of refname is limited, it is important that the string_list passed to string_list_add_one_ref() has strdup_strings set. Document this fact. All current callers do

Re: [PATCH v2 00/25] Remove assumptions about each_ref_fn arg lifetimes

2013-05-29 Thread Thomas Rast
Michael Haggerty mhag...@alum.mit.edu writes: I read the entire series on Monday, and give it an Ack at maybe 90% confidence level -- sorry, I was short on caffeine and sleep ;-) I meant to verify this assertion: I did a manual audit of the 50 (!) functions that are used as an each_ref_fn

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Thomas Rast
Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:09 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: Feel free to implement that. I'm just interested in 'git cherry-pick' being usable for 'git rebase' purposes. Which

Git status reports untracked on tracked files

2013-05-29 Thread Andrey Kiyanovsky
I would be grateful for any thoughts about the follow problem. Git status reports untracked files: $ git status # On branch master # Untracked files: # (use git add file... to include in what will be committed) # #

Re: git hangs on pthread_join

2013-05-29 Thread Ian Kumlien
On Tue, May 28, 2013 at 01:51:09PM -0400, Jeff King wrote: On Thu, May 23, 2013 at 03:01:43PM +0200, Ian Kumlien wrote: git 1.8.2.1 is started by xinetd [...] I have found git receive-packs that has been running for days/weeks without terminating Attaching gdb and doing a trace

Re: Git Merge 2013 Conference, Berlin

2013-05-29 Thread Enrico Weigelt
Scott Chacon wrote: We're starting off in Berlin, May 9-11th. GitHub has secured conference space at the Radisson Blu Berlin for those days. I have a It's a pity that you did not announce the event on the msysgit mailing list, too, which is why I totally missed it until today, the

Re: Merge conflicts with version numbers in release branches

2013-05-29 Thread Enrico Weigelt
Thomas Koch wrote: it's a common problem[1,2,3] in Maven (Java) projects and probably in other environments too: You have the version number of your project written in the pom.xml. When one merges changes upwards from the maint branche to master, the version numbers in maint and master are

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Joachim Schmitz
Felipe Contreras wrote: Junio C Hamano wrote: Neil Horman nhor...@tuxdriver.com writes: On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 7 +-- 1 file

Re: [PATCH v2 5/7] add tests for rebasing merged history

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: +# f +# / +# a---b---c---g---h +# \ +# d---G---i +#\ \ +# e---u +# +# uppercase = cherry-picked +# h = reverted g +test_expect_failure rebase -p --onto in merged history does not lose

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 4:58 AM, Joachim Schmitz j...@schmitz-digital.de wrote: Felipe Contreras wrote: Junio C Hamano wrote: It probably is better to fold this patch into the other one when it is rerolled to correct the option name gotcha on the tin. Why? This patch is standalone and

[PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash

2013-05-29 Thread Ramkumar Ramachandra
For rr/rebase-autostash, which is stalled in pu. See $gmane/225689. This is a super-minor fix anyway: if you disagree with something, change it; there's no need to ask me. As for the follow-up introducing a 'stash store', I will submit it in good time: there's no hurry. I'm working on some

RE: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Joachim Schmitz
From: Felipe Contreras [mailto:felipe.contre...@gmail.com] Sent: Wednesday, May 29, 2013 12:52 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH 1/2] sequencer: trivial fix On Wed, May 29, 2013 at 4:58 AM, Joachim Schmitz j...@schmitz-digital.de wrote: Felipe Contreras

Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

2013-05-29 Thread Stefano Lattarini
On 05/29/2013 06:16 AM, Felipe Contreras wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index 76900a0..9b5d78b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -335,6

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 3:40 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:09 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: Feel free to implement that. I'm just interested

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 6:13 AM, Joachim Schmitz j...@schmitz-digital.de wrote: From: Felipe Contreras [mailto:felipe.contre...@gmail.com] Sent: Wednesday, May 29, 2013 12:52 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH 1/2] sequencer: trivial fix On Wed, May 29, 2013

Re: What's cooking in git.git (May 2013, #08; Tue, 28)

2013-05-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: * rr/rebase-autostash (2013-05-12) 7 commits - rebase: implement --[no-]autostash and rebase.autostash - rebase --merge: return control to caller, for housekeeping - rebase -i: return control to caller, for housekeeping - am: return control to caller, for

RE: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Joachim Schmitz
From: Felipe Contreras [mailto:felipe.contre...@gmail.com] Sent: Wednesday, May 29, 2013 1:24 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH 1/2] sequencer: trivial fix On Wed, May 29, 2013 at 6:13 AM, Joachim Schmitz j...@schmitz-digital.de wrote: From: Felipe

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Thomas Rast
Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:40 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:09 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com

RE: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Joachim Schmitz
From: Joachim Schmitz [mailto:j...@schmitz-digital.de] Sent: Wednesday, May 29, 2013 1:30 PM To: 'Felipe Contreras' Cc: 'git@vger.kernel.org' Subject: RE: [PATCH 1/2] sequencer: trivial fix snip And for the record: I agree with you that these 2 things should rather not be in a single

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 6:34 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:40 AM, Thomas Rast tr...@inf.ethz.ch wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 29, 2013 at 3:09 AM, Thomas Rast

Re: [PATCH] git-remote-mediawiki: better error message when HTTP(S) access fails

2013-05-29 Thread Matthieu Moy
Jeff King p...@peff.net writes: On Thu, May 23, 2013 at 10:05:03PM +0200, Matthieu Moy wrote: My use-case is an invalid SSL certificate. Pulling from the wiki with a recent version of libwww-perl fails, and git-remote-mediawiki gave no clue about the reason. Give the mediawiki API detailed

[PATCH v2] git-remote-mediawiki: better error message when HTTP(S) access fails

2013-05-29 Thread Matthieu Moy
My use-case is an invalid SSL certificate. Pulling from the wiki with a recent version of libwww-perl fails, and git-remote-mediawiki gave no clue about the reason. Give the mediawiki API detailed error message, and since it is not so informative, hint the user about an invalid SSL certificate on

Re: [PATCH 2/2] archive: loosen restrictions on remote object lookup

2013-05-29 Thread Ian Harvey
So, did this patch make it anywhere? We could really use it. Here's the use case. The original ee27ca4 patch broke our build system when the git server was upgraded to Debian Wheezy last night. The builder fetches source from the repo in two pieces using git archive, and we need to make sure both

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Ramkumar Ramachandra
Thomas Rast wrote: So until this changes, my $0.02 is a blanket NAK and a refusal to spend my time reviewing. Then don't review the damn thing. With Felipe, I have the following rule of thumb: make some concrete suggestions and forget about follow-ups. He's not going to accept any general

[PATCH v2] get_sha1: warn about full or short object names that look like refs

2013-05-29 Thread Nguyễn Thái Ngọc Duy
When we get 40 hex digits, we immediately assume it's an SHA-1. This is the right thing to do because we have no way else to specify an object. If there is a ref with the same object name, it will be ignored. Warn the user about this case because the ref with full object name is likely a mistake,

Re: [PATCH v2 8/8] revert/cherry-pick: add --skip option

2013-05-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: Akin to 'am --skip' and 'rebase --skip'. This ranged-cherry-pick can be useful for small ranges. As pointed out by others on the list, it hemorrhages memory quite horribly (and this problem is non-trivial to fix). Perhaps we should document this in limitations or bugs

git ignore regression in 1.8.3

2013-05-29 Thread Nicolas Desprès
Hi all, First of all I would like to thank you all for the great tool that is git. I love it and it makes my days way better. This is my first post on this mailing list so please apology if there is something wrong. I have noticed a regression in the behavior of ignore rules in 1.8.3. I have

Re: [PATCH v2 7/8] revert/cherry-pick: add --quiet option

2013-05-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: if (opts-skip_empty is_index_unchanged() == 1) { - warning(_(skipping %s... %s), - find_unique_abbrev(commit-object.sha1, DEFAULT_ABBREV), - msg.subject); + if (!opts-quiet) +

git init doesn't create master branch

2013-05-29 Thread Ákos, Tajti
Dear List, the manual of git init says: An initial HEAD file that references the HEAD of the master branch is also created. However, after creating the repository using git init there's no master branch. How can make sure that master is created? Thanks in advance, Ákos Tajti -- To

Re: git init doesn't create master branch

2013-05-29 Thread Matthieu Moy
Ákos, Tajti akos.ta...@intland.com writes: Dear List, the manual of git init says: An initial HEAD file that references the HEAD of the master branch is also created. However, after creating the repository using git init there's no master branch. Right, but HEAD still points to it ;-). We

Re: [PATCH v2 0/7] Rebase topology test

2013-05-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: I think a lot of the functionality of 'git rebase' should move to 'git cherry-pick', and then all the 'git rebase' code can be simplified greatly, and tests like these would help a lot. What do we do about the leakages? Want to take on the task of fixing the

Re: git init doesn't create master branch

2013-05-29 Thread Ramkumar Ramachandra
Matthieu Moy wrote: the manual of git init says: An initial HEAD file that references the HEAD of the master branch is also created. However, after creating the repository using git init there's no master branch. Right, but HEAD still points to it ;-). We sometimes call this an unborn

Re: git init doesn't create master branch

2013-05-29 Thread Ákos, Tajti
Thanks for clarifying this thing for me! I don't really insist on having a master branch it's just that I tried to pull from a repository bundle and I got this error message: Cannot merge multiple branches into empty head The command was: git pull ../dump.dmp refs/heads/*:refs/heads/* Is

Re: git init doesn't create master branch

2013-05-29 Thread Matthieu Moy
Ákos, Tajti akos.ta...@intland.com writes: The command was: git pull ../dump.dmp refs/heads/*:refs/heads/* git pull does internally a git fetch followed by a git merge. If you try to pull several branches at the same time, it means you want to merge all of them together (octopus merge),

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Neil Horman
On Tue, May 28, 2013 at 09:32:59PM -0500, Felipe Contreras wrote: Junio C Hamano wrote: Neil Horman nhor...@tuxdriver.com writes: On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 7:09 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Thomas Rast wrote: So until this changes, my $0.02 is a blanket NAK and a refusal to spend my time reviewing. Then don't review the damn thing. With Felipe, I have the following rule of thumb: make some concrete

Re: git init doesn't create master branch

2013-05-29 Thread Ákos, Tajti
Thanks! I ill try using fetch. Ákos 2013.05.29. 15:08 keltezéssel, Matthieu Moy írta: Ákos, Tajti akos.ta...@intland.com writes: The command was: git pull ../dump.dmp refs/heads/*:refs/heads/* git pull does internally a git fetch followed by a git merge. If you try to pull several

Re: git init doesn't create master branch

2013-05-29 Thread Ramkumar Ramachandra
Ákos, Tajti wrote: Cannot merge multiple branches into empty head The command was: git pull ../dump.dmp refs/heads/*:refs/heads/* Is this a better way of doing this? pull runs a fetch, which updated .git/FETCH_HEAD. Now, if .git/FETCH_HEAD has just one branch (and other not-for-merge

Re: [PATCH v3] wildmatch: properly fold case everywhere

2013-05-29 Thread Duy Nguyen
On Tue, May 28, 2013 at 8:58 PM, Anthony Ramine n.ox...@gmail.com wrote: Case folding is not done correctly when matching against the [:upper:] character class and uppercased character ranges (e.g. A-Z). Specifically, an uppercase letter fails to match against any of them when case folding is

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Duy Nguyen
On Mon, May 27, 2013 at 11:52 PM, Felipe Contreras felipe.contre...@gmail.com wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Micronit: perhaps you should move the free obejcts before leaving (in do_pick_commit) to the subject instead of

Re: [PATCH v2 8/8] revert/cherry-pick: add --skip option

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 7:27 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: Akin to 'am --skip' and 'rebase --skip'. This ranged-cherry-pick can be useful for small ranges. As pointed out by others on the list, it hemorrhages memory quite horribly (and this

Re: [PATCH v2 7/8] revert/cherry-pick: add --quiet option

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 7:33 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: if (opts-skip_empty is_index_unchanged() == 1) { - warning(_(skipping %s... %s), - find_unique_abbrev(commit-object.sha1, DEFAULT_ABBREV), -

Re: git ignore regression in 1.8.3

2013-05-29 Thread Duy Nguyen
On Wed, May 29, 2013 at 7:31 PM, Nicolas Desprès nicolas.desp...@gmail.com wrote: I have noticed a regression in the behavior of ignore rules in 1.8.3. Yeah, it looks like everybody suddenly realizes this regression soon after the release, not before :( This has been reported three times so far.

Re: [PATCH v2 7/8] revert/cherry-pick: add --quiet option

2013-05-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: Did you miss the -q option passed to 'git commit'? Ah, yes. It would help if you mentioned: Introduce --quiet to suppress warning about skipped commits (when using --skip-empty) and output from 'git commit'. in the commit message. Thanks. -- To unsubscribe from

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:25 AM, Duy Nguyen pclo...@gmail.com wrote: On Mon, May 27, 2013 at 11:52 PM, Felipe Contreras felipe.contre...@gmail.com wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Micronit: perhaps you should move the

Re: [PATCH v3] wildmatch: properly fold case everywhere

2013-05-29 Thread Anthony Ramine
Replied inline. Regards, -- Anthony Ramine Le 29 mai 2013 à 15:22, Duy Nguyen a écrit : On Tue, May 28, 2013 at 8:58 PM, Anthony Ramine n.ox...@gmail.com wrote: Case folding is not done correctly when matching against the [:upper:] character class and uppercased character ranges (e.g.

Re: [PATCH v2 7/8] revert/cherry-pick: add --quiet option

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:32 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: Did you miss the -q option passed to 'git commit'? Ah, yes. It would help if you mentioned: Introduce --quiet to suppress warning about skipped commits (when using --skip-empty) and

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Duy Nguyen
On Wed, May 29, 2013 at 8:34 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 8:25 AM, Duy Nguyen pclo...@gmail.com wrote: On Mon, May 27, 2013 at 11:52 PM, Felipe Contreras felipe.contre...@gmail.com wrote: We should free objects before leaving. Signed-off-by:

Re: git ignore regression in 1.8.3

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:31 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 7:31 PM, Nicolas Desprès nicolas.desp...@gmail.com wrote: I have noticed a regression in the behavior of ignore rules in 1.8.3. Yeah, it looks like everybody suddenly realizes this regression soon

Re: [PATCH RESEND v2] path: Fix a sparse warning

2013-05-29 Thread Torsten Bögershausen
On 2013-05-28 19.04, Junio C Hamano wrote: Can you tell me what the conclusion on the discussion on your two other patches on 'pu'? * rj/mingw-cygwin (2013-05-08) 2 commits - cygwin: Remove the CYGWIN_V15_WIN32API build variable - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE I

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:42 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 8:34 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 8:25 AM, Duy Nguyen pclo...@gmail.com wrote: On Mon, May 27, 2013 at 11:52 PM, Felipe Contreras

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: What you are really complaining about is that I don't agree with *every* single suggestion you make. And since you made them, they must be sensible, and single I don't agree with you, I must not be sensible, is that right? Oh, I have no problems: I reviewed

Re: [PATCH v3] wildmatch: properly fold case everywhere

2013-05-29 Thread Duy Nguyen
On Wed, May 29, 2013 at 8:37 PM, Anthony Ramine n.ox...@gmail.com wrote: Le 29 mai 2013 à 15:22, Duy Nguyen a écrit : On Tue, May 28, 2013 at 8:58 PM, Anthony Ramine n.ox...@gmail.com wrote: Case folding is not done correctly when matching against the [:upper:] character class and uppercased

Re: [PATCH v2 0/7] Rebase topology test

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 7:50 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: I think a lot of the functionality of 'git rebase' should move to 'git cherry-pick', and then all the 'git rebase' code can be simplified greatly, and tests like these would help a lot.

Re: git ignore regression in 1.8.3

2013-05-29 Thread Nicolas Desprès
On Wed, May 29, 2013 at 3:31 PM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 7:31 PM, Nicolas Desprès nicolas.desp...@gmail.com wrote: I have noticed a regression in the behavior of ignore rules in 1.8.3. Yeah, it looks like everybody suddenly realizes this regression soon

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Duy Nguyen
On Wed, May 29, 2013 at 8:46 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 8:42 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 8:34 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 8:25 AM, Duy Nguyen

Re: [PATCH 1/3] cherry-pick: add support to copy notes

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:48 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: There's nothing wrong with me choosing how best to spend my time. Really. Ofcourse you are. You have arguably spent it very productively solving a lot of user issues (especially

Re: [PATCH 1/2] sequencer: trivial fix

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 8:54 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 8:46 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, May 29, 2013 at 8:42 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, May 29, 2013 at 8:34 PM, Felipe Contreras

Check out doesn't set x-flag on CIFS

2013-05-29 Thread Andre Esser
Hello, When on a CIFS filesystem a git checkout does not replicate the executable flag from the repository: $ git clone git://git/abettersqlplus Cloning into 'abettersqlplus'... remote: Counting objects: 522, done. remote: Compressing objects: 100% (342/342), done. remote: Total 522

Re: [PATCH] git-remote-mediawiki: better error message when HTTP(S) access fails

2013-05-29 Thread Jeff King
On Wed, May 29, 2013 at 02:01:59PM +0200, Matthieu Moy wrote: I wonder if we can do something like: our $mw_operation; $mediawiki-{config}-{on_error} = sub { [...] die $err\n; }; Probably, but that would hardcode the fact that mediawiki errors are fatal, while in

Re: [PATCH v2] git-remote-mediawiki: better error message when HTTP(S) access fails

2013-05-29 Thread Jeff King
On Wed, May 29, 2013 at 02:06:29PM +0200, Matthieu Moy wrote: My use-case is an invalid SSL certificate. Pulling from the wiki with a recent version of libwww-perl fails, and git-remote-mediawiki gave no clue about the reason. Give the mediawiki API detailed error message, and since it is not

[PATCH v3] difftool --dir-diff: allow changing any clean working tree file

2013-05-29 Thread Kenichi Saita
The temporary directory prepared by difftool --dir-diff to show the result of a change can be modified by the user via the tree diff program, and we try hard not to lose changes to them after tree diff program returns to us. However, the set of files to be copied back is computed differently

Re: [PATCH v2 11/25] object_array_remove_duplicates(): rewrite to reduce copying

2013-05-29 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The old version copied one entry to its destination position, then deleted any matching entries from the tail of the array. This required the tail of the array to be copied multiple times. It didn't affect the complexity of the algorithm because

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

2013-05-29 Thread Karsten Blees
Am 29.05.2013 06:19, schrieb Duy Nguyen: On Wed, May 29, 2013 at 10:41 AM, Duy Nguyen pclo...@gmail.com wrote: The changes in this area since 1.8.2.3 seem to be Karsten's (I'm not blaming, just wanted to narrow down the problem). The patterns of interest seem to be !/bin /bin/* !/bin/brew

Re: [PATCH v2 15/25] object_array_entry: fix memory handling of the name field

2013-05-29 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Change the callers that were already passing copies to add_object_array_with_mode() to either skip the copy, or (if the memory needed to be allocated anyway) freeing the memory itself. A part of this commit effectively reverts 70d26c6e76

Re: [PATCH v2 7/8] remote-bzr: reorganize the way 'wanted' works

2013-05-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +wanted = get_config('remote-bzr.branches').rstrip().split(', ') Two minor nits and one design suggestion: - Why rstrip() not strip()?

Re: [PATCH 4/5] test: improve rebase -q test

2013-05-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Let's show the output so it's clear why it failed. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3400-rebase.sh | 1 + 1 file changed,

Re: [PATCH v2 25/25] refs: document the lifetime of the args passed to each_ref_fn

2013-05-29 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The commits leading up to this have (hopefully) fixed all of the callers of the for_each_ref()-like functions. This commit does the last step: documents what each_ref_fn callbacks can assume about object lifetimes. Signed-off-by: Michael

Re: [PATCH v2 7/8] remote-bzr: reorganize the way 'wanted' works

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 11:42 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +wanted = get_config('remote-bzr.branches').rstrip().split(', ')

Re: [PATCH 4/5] test: improve rebase -q test

2013-05-29 Thread Felipe Contreras
On Wed, May 29, 2013 at 11:52 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Let's show the output so it's clear why it failed. Signed-off-by: Felipe Contreras

Re: [PATCH 2/4] remote-helpers: rename tests

2013-05-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: I do not see how it makes sense to copy how they deviate from us back to our codebase, especially if we plan to eventually move some of these tests out of contrib/ area, but even without such a plan in the future. They deviate from us, we

Re: What's cooking in git.git (May 2013, #08; Tue, 28)

2013-05-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: * fc/makefile (2013-05-26) 5 commits - build: do not install git-remote-testpy - build: add NO_INSTALL variable - build: cleanup using $ - build: cleanup using $^ - build: trivial simplification (this branch

Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash

2013-05-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: For rr/rebase-autostash, which is stalled in pu. See $gmane/225689. This is a super-minor fix anyway: if you disagree with something, change it; there's no need to ask me. As I wasn't the one who were disagreeing, that would not work well.

Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash

2013-05-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: As I wasn't the one who were disagreeing, that would not work well. I meant in the tiny details like echo + gettext versus gettext. From the review of v3, nobody had any disagreements; just minor suggestions: that's what this patch is about anyway. -- To unsubscribe from

  1   2   >