Re: Corner case bug caused by shell dependent behavior

2014-03-14 Thread David Kastrup
Jeff King p...@peff.net writes: Hmph. We ran into this before and fixed all of the sites (e.g., d1c3b10 and 938791c). This one appears to have been added a few months later (by 68d5d03). Maybe there are more places where it would be more robust to use printf instead of echo. FWIW, I just

Re: [RFC/PATCH] diff: simplify cpp funcname regex

2014-03-14 Thread Johannes Sixt
Am 3/14/2014 4:54, schrieb Jeff King: On Fri, Mar 07, 2014 at 08:23:05AM +0100, Johannes Sixt wrote: No, I meant lines like static double var; -static int old; +static int new; The motivation is to show hints where in a file the change is located: Anything that could be of

Re: Committing a change from one branch another branch

2014-03-14 Thread Jagan Teki
Hi Brandon McCaig, On Thu, Mar 13, 2014 at 9:06 PM, Brandon McCaig bamcc...@gmail.com wrote: Jagan: On Thu, Mar 13, 2014 at 4:56 AM, Jagan Teki jagannadh.t...@gmail.com wrote: Hi, Hello, I have two branches. - master-b1 - master-b2 Suppose I'm in master-b1 then did a change on

Re: No progress from push when using bitmaps

2014-03-14 Thread Michael Haggerty
On 03/13/2014 11:07 PM, Jeff King wrote: On Thu, Mar 13, 2014 at 03:01:09PM -0700, Shawn Pearce wrote: It would definitely be good to have throughput measurements while writing out the pack. However, I'm not sure we have anything useful to count. We know the total number of objects we're

Re: No progress from push when using bitmaps

2014-03-14 Thread Duy Nguyen
On Fri, Mar 14, 2014 at 4:43 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Would it be practical to change it to a percentage of bytes written? Then we'd have progress info that is both convenient *and* truthful. I agreed for a second, then remembered that we don't know the final pack size

Re: [PATCH v3 0/8] Hiding refs

2014-03-14 Thread Duy Nguyen
On Wed, Mar 12, 2014 at 3:36 AM, Jeff King p...@peff.net wrote: If the client is limited to setting a few flags, then something like http can get away with: GET foo.git/info/refs?service=git-upload-packadvertise-symrefsrefspec=refs/heads/* And it does not need to worry about upload-pack2

Re: question about: Facebook makes Mercurial faster than Git

2014-03-14 Thread Duy Nguyen
On Mon, Mar 10, 2014 at 6:28 PM, demerphq demer...@gmail.com wrote: I had the impression, and I would not be surprised if they had the impression that the git development community is relatively unconcerned about performance issues on larger repositories. There have been other reports, which

Re: [PATCH 3/3] reset: Print a warning when user uses git reset during a merge

2014-03-14 Thread Marc Branchaud
On 14-03-14 12:37 AM, Andrew Wong wrote: During a merge, --mixed is most likely not what the user wants. Using --mixed during a merge would leave the merged changes and new files mixed in with the local changes. The user would have to manually clean up the work tree, which is non-trivial. In

Re: [PATCH] general style: replaces memcmp() with proper starts_with()

2014-03-14 Thread Quint Guvernator
2014-03-14 0:57 GMT-04:00 Jeff King p...@peff.net: This discussion ended up encompassing a lot of other related cleanups. I hope we didn't scare you away. :) I don't think you could; this community is much more accepting than other software communities around the web. The fact that I received

Re: No progress from push when using bitmaps

2014-03-14 Thread Jeff King
On Fri, Mar 14, 2014 at 05:21:59PM +0700, Duy Nguyen wrote: On Fri, Mar 14, 2014 at 4:43 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Would it be practical to change it to a percentage of bytes written? Then we'd have progress info that is both convenient *and* truthful. I agreed

Re: [PATCH] general style: replaces memcmp() with starts_with()

2014-03-14 Thread Quint Guvernator
2014-03-13 12:05 GMT-04:00 Michael Haggerty mhag...@alum.mit.edu: It is very, very unlikely that you inverted the sense of dozens of tests throughout the Git code base and the tests ran correctly. I rather think that you made a mistake when testing. You should double- and triple-check that

[PATCH] microproject for GSOC

2014-03-14 Thread ubuntu733
Apply for GSOC.The microprojects is rewriter diff-index.c Signed-off-by: ubuntu733 ubuntu2...@126.com --- diff-no-index.c | 11 ++- dir.h |3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 8e10bff..91ece64 100644

Re: [PATCH v3 0/8] Hiding refs

2014-03-14 Thread Shawn Pearce
On Fri, Mar 14, 2014 at 5:37 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Mar 12, 2014 at 3:36 AM, Jeff King p...@peff.net wrote: If the client is limited to setting a few flags, then something like http can get away with: GET

Re: [PATCH] GSoC Change multiple if-else statements to be table-driven

2014-03-14 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Thanks for the resubmission. Comments below. Thanks, Eric, for helping so many micro exercises. On Thu, Mar 13, 2014 at 4:20 PM, Yao Zhao zhaox...@umn.edu wrote: Subject: [PATCH] GSoC Change multiple if-else statements to be table-driven It's a

Re: [PATCH] general style: replaces memcmp() with proper starts_with()

2014-03-14 Thread Junio C Hamano
Quint Guvernator quintus.pub...@gmail.com writes: I'll be re-reading this thread and working on this patch over the weekend to try to identify the more straightforward hunks I could submit in a patch. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: [PATCH 3/3] reset: Print a warning when user uses git reset during a merge

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 10:33 AM, Marc Branchaud marcn...@xiplink.com wrote: I know this approach was suggested earlier, but given these dangers it seems silly to give this big warning on a plain git reset but still go ahead and do the things the warning talks about. Is there any issue with

Re: [PATCH] microproject for GSOC

2014-03-14 Thread Matthieu Moy
Hi, Welcome to the Git community, and welcome to the GSOC program. Below are some comments to give you a taste of what a review looks like on this list. Do take the comments seriously (they should be addressed), but don't take them badly: critic is meant to be constructive. ubuntu733

Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
Hi, I have two branch in one repo that I need to maintain for 2 different deliveries. Say branch1 and branch2 in test.git repo. test.git - branch1 foo_v1/text.txt foo_v2/text.txt - branch2 foo/text.txt branch1 is developers branch all source looks version'ed manner and branch2 is

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
Don't know what happen, I'm unable to join #git channel [23:40] Jagan hi [23:40] == Cannot send to channel: #git Can any one help! On Fri, Mar 14, 2014 at 11:09 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Hi, I have two branch in one repo that I need to maintain for 2 different

Re:Re: [PATCH] microproject for GSOC

2014-03-14 Thread 沈承恩
Thank you for your comments.I will amend those issues .As a Chinese student,what name should I use?My Chinese name is ok? I am very interest in Open source.What can I do to increase my chance? At 2014-03-15 01:10:57,Matthieu Moy matthieu@grenoble-inp.fr wrote: Hi, Welcome to the Git

Re:Re: [PATCH] microproject for GSOC

2014-03-14 Thread 沈承恩
Thank you for your comments.I will amend those issues .As a Chinese student,what name should I use?My Chinese name is ok? At 2014-03-15 01:10:57,Matthieu Moy matthieu@grenoble-inp.fr wrote: Hi, Welcome to the Git community, and welcome to the GSOC program. Below are some comments to give you

Re: Git Config pushInsteadOf is not working

2014-03-14 Thread Phil Hord
I thought you had the URLs backwards, but that doesn't seem to be the problem, assuming I am reading your transcription correctly. Maybe the 'insteadOf' is being applied in addition to (and cancelling out) the pushInsteadOf. Does it work as expected if you remove one or the other? In any case,

Re: [PATCH] microproject for GSOC

2014-03-14 Thread Matthieu Moy
沈承恩 ubuntu2...@126.com writes: Thank you for your comments.I will amend those issues .As a Chinese student,what name should I use?My Chinese name is ok? I guess it is. The git.git history already has contribution from 张忠山 for example (I don't know if it is chineese, but it looks so from my

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in terms of dir_version/ then I need to apply on my local repo branch1, till now is fine then I need to apply same 10 patches on to my branch2 where source

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in terms of dir_version/ then I need to apply on my local repo branch1, till now

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 4:01 PM, Jagan Teki jagannadh.t...@gmail.com wrote: On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in

Re: [PATCH 3/3] reset: Print a warning when user uses git reset during a merge

2014-03-14 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: On Fri, Mar 14, 2014 at 10:33 AM, Marc Branchaud marcn...@xiplink.com wrote: I know this approach was suggested earlier, but given these dangers it seems silly to give this big warning on a plain git reset but still go ahead and do the things the

bug report: regression in git subtree add

2014-03-14 Thread Peter Wolanin
In this commit: https://github.com/git/git/commit/10a49587fabde88c0afbc80a99d97fae91811f5f git subtree add for a remote repository and branch was fundamentally broken. It works by chance if a local branch exists that matches the name of the desired remote branch. Thus, master happens to work

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
On Sat, Mar 15, 2014 at 2:07 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 4:01 PM, Jagan Teki jagannadh.t...@gmail.com wrote: On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com

Re: RFC GSoC idea: new git config features

2014-03-14 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Sat, Mar 01, 2014 at 12:01:44PM +0100, Matthieu Moy wrote: Jeff King p...@peff.net writes: If we had the keys in-memory, we could reverse this: config code asks for keys it cares about, and we can do an optimized lookup (binary search, hash, etc).

[PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh

2014-03-14 Thread Jens Lehmann
Since 83d842dc8 make test using prove fails for some setups in t5541 with: Parse errors: No plan found in TAP output Running t5541 on its own fails with: error: Can't use skip_all after running some tests This happens because start_httpd (which determines if the test is to be skipped) is

[PATCH][GSOC2014] install_branch_config: change logical chain to lookup table

2014-03-14 Thread TamerTas
Signed-off-by: TamerTas tamer...@outlook.com --- Thanks again for the feedback it's been a great learning experience. Comments Below :) I have refactored the commit [1] to * suggested changes [2]. format-patch was placing 2 hyphens instead of 3 but it's fixed now. I've turned the table into a

Re: [PATCH 3/3] reset: Print a warning when user uses git reset during a merge

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 4:55 PM, Junio C Hamano gits...@pobox.com wrote: For the users that really did mean --merge, the warning is silly. It's basically saying We know that you're about to mess up your work tree, but we let you mess up anyway. Learn the correct way so that you don't mess up

Re: [PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh

2014-03-14 Thread Jeff King
On Fri, Mar 14, 2014 at 10:18:32PM +0100, Jens Lehmann wrote: Since 83d842dc8 make test using prove fails for some setups in t5541 with: Parse errors: No plan found in TAP output Running t5541 on its own fails with: error: Can't use skip_all after running some tests This

Re: [PATCH] t5541: don't call start_httpd after sourcing lib-terminal.sh

2014-03-14 Thread Junio C Hamano
Jeff King p...@peff.net writes: One option would be to _always_ define test_terminal That looks like the right direction to go. Something like the patch below (looks like we should be using $PERL_PATH instead of perl, too). ;-) Also a SP between test_terminal and (), perhaps. diff

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 4:57 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Mr.J git cherry-pick -X subtree=foo cc70089614de16b46c08f32ea61c972fea2132ce 14e9c9b20e3bf914f6a38ec720896b3d67f94c90 error: could not apply cc70089... A hint: after resolving the conflicts, mark the

[PATCH] t/lib-terminal: make TTY a lazy prerequisite

2014-03-14 Thread Jeff King
On Fri, Mar 14, 2014 at 02:47:14PM -0700, Junio C Hamano wrote: Something like the patch below (looks like we should be using $PERL_PATH instead of perl, too). Actually, we don't need to do this, as of 94221d2 (t: use perl instead of $PERL_PATH where applicable, 2013-10-28). If only the

Re: [PATCH] t/lib-terminal: make TTY a lazy prerequisite

2014-03-14 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 14, 2014 at 02:47:14PM -0700, Junio C Hamano wrote: Something like the patch below (looks like we should be using $PERL_PATH instead of perl, too). Actually, we don't need to do this, as of 94221d2 (t: use perl instead of $PERL_PATH where

What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-14 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. More topics merged to 'master', some of which have been cooking before the v1.9.0 final release. You can find the changes described here in

Re: [PATCH] t/lib-terminal: make TTY a lazy prerequisite

2014-03-14 Thread Jens Lehmann
Am 14.03.2014 22:57, schrieb Jeff King: On Fri, Mar 14, 2014 at 02:47:14PM -0700, Junio C Hamano wrote: Something like the patch below (looks like we should be using $PERL_PATH instead of perl, too). Actually, we don't need to do this, as of 94221d2 (t: use perl instead of $PERL_PATH

Re: [PATCH v3 0/8] Hiding refs

2014-03-14 Thread Duy Nguyen
On Fri, Mar 14, 2014 at 11:45 PM, Shawn Pearce spea...@spearce.org wrote: On Fri, Mar 14, 2014 at 5:37 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Mar 12, 2014 at 3:36 AM, Jeff King p...@peff.net wrote: If the client is limited to setting a few flags, then something like http can get away

Re: Corner case bug caused by shell dependent behavior

2014-03-14 Thread Uwe Storbeck
On Mar 13, Jonathan Nieder wrote: May we have your sign-off? (See Documentation/SubmittingPatches section Sign your work for what this means. I could have found that myself .. thanks! I'll try to follow it now. :) I'll resend the patch. Hopefully I'll do it right. Would it make sense to add

Re: No progress from push when using bitmaps

2014-03-14 Thread Duy Nguyen
On Fri, Mar 14, 2014 at 10:29 PM, Jeff King p...@peff.net wrote: If an object is reused, we already know its compressed size. If it's not reused and is a loose object, we could use on-disk size. It's a lot harder to estimate an not-reused, deltified object. All we have is the uncompressed

[PATCH v2] rebase -i: replace an echo command by printf

2014-03-14 Thread Uwe Storbeck
to avoid shell dependent behavior. When your system shell (/bin/sh) is a dash backslash sequences in strings are interpreted by the echo command. A commit message which ends with the string '\n' may result in a garbage line in the todo list of an interactive rebase which causes the rebase to

[PATCH] test-lib.sh: use printf instead of echo

2014-03-14 Thread Uwe Storbeck
when variables may contain backslash sequences. Backslash sequences are interpreted as control characters by the echo command of some shells (e.g. dash). Signed-off-by: Uwe Storbeck u...@ibr.ch --- t/test-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH/RFC] t3404: test autosquash for fixup! commits with funny messages

2014-03-14 Thread Uwe Storbeck
This commit adds a test to verify the correct behavior when rebase -i is used to autosquash fixup! commits where the commit message contains a backslash sequence (\n). When echo is used instead of printf to handle such a commit message the test will fail on shells (e.g. dash) where the echo

Re: [PATCH v3 0/8] Hiding refs

2014-03-14 Thread Shawn Pearce
On Fri, Mar 14, 2014 at 4:30 PM, Duy Nguyen pclo...@gmail.com wrote: On Fri, Mar 14, 2014 at 11:45 PM, Shawn Pearce spea...@spearce.org wrote: You missed the SSH case. It doesn't have this slot to hide the data into. Right now we run this for ssh case: ssh host git-upload-pack repo-path. New

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-14 Thread Jonathan Nieder
Uwe Storbeck wrote: Backslash sequences are interpreted as control characters by the echo command of some shells (e.g. dash). This has bothered me for a while but never enough to do anything about it. Thanks for fixing it. Signed-off-by: Uwe Storbeck u...@ibr.ch Reviewed-by: Jonathan

[PATCH] [GSoC] Use strchrnul to save additional scan of string

2014-03-14 Thread Shubham Chaudhary
From c422507408824403ed18e89ec0bbc32b8764e09c Mon Sep 17 00:00:00 2001 From: Shubham Chaudhary shubham.chaudh...@kdemail.net Date: Sat, 15 Mar 2014 05:56:18 +0530 Subject: [PATCH] [GSoC] Use strchrnul to save additional scan of string Some strings are scanned twice unnecessarily, once with

Re: [PATCH v3 0/8] Hiding refs

2014-03-14 Thread Duy Nguyen
On Tue, Mar 11, 2014 at 8:49 AM, Jeff King p...@peff.net wrote: Right, I recall the general feeling being that such a system would work, and the transition would be managed by a config variable like remote.*.useUploadPack2. Probably with settings like: true: always try, but allow fall

Re: [PATCH] t/lib-terminal: make TTY a lazy prerequisite

2014-03-14 Thread Jeff King
On Fri, Mar 14, 2014 at 03:05:45PM -0700, Junio C Hamano wrote: Actually, we don't need to do this, as of 94221d2 (t: use perl instead of $PERL_PATH where applicable, 2013-10-28). If only the author of that commit were here to correct me... Yuck. I forgot all about that, too. I wonder

Kitchen Designer London

2014-03-14 Thread positively
K*i t c h e n Designer London. Thirty Ex D1splay K*i t c h e n s To Clear. W w w . e x d I s p la y k I t ch e n s 1 . c o .u k £ 595 Each with appliances. -- View this message in context: http://git.661346.n2.nabble.com/Kitchen-Designer-London-tp7605683.html Sent from the git mailing list

[PATCH 0/2] pack-bitmap progress meters

2014-03-14 Thread Jeff King
Here are patches to make the pack-objects progress meters behave the same both with and without pack reuse. The first one is basically the patch I posted earlier. The second one drops the Reusing existing pack, and just rolls those numbers into Counting objects. I have mixed feelings on it. _I_

[PATCH 1/2] pack-objects: show progress for reused packfiles

2014-03-14 Thread Jeff King
When the --all-progress option is in effect, pack-objects shows a progress report for the writing phase. If the repository has bitmaps and we are reusing a packfile, the user sees no progress update until the whole packfile is sent. Since this is typically the bulk of what is being written, it

[PATCH 2/2] pack-objects: show reused packfile objects in Counting objects

2014-03-14 Thread Jeff King
When we are sending a pack for push or fetch, we may reuse a chunk of packfile without even parsing it. The progress meter then looks like this: Reusing existing pack: 3440489, done. Counting objects: 3, done. The first line shows that we are reusing a large chunk of objects, and then we

[PATCH] pack-objects: turn off bitmaps when skipping objects

2014-03-14 Thread Jeff King
The pack bitmap format requires that we have a single bit for each object in the pack, and that each object's bitmap represents its complete set of reachable objects. Therefore we have no way to represent the bitmap of an object which references objects outside the pack. We notice this problem

Re: [PATCH] [GSoC] Use strchrnul to save additional scan of string

2014-03-14 Thread Jeff King
On Sat, Mar 15, 2014 at 06:19:08AM +0530, Shubham Chaudhary wrote: From c422507408824403ed18e89ec0bbc32b8764e09c Mon Sep 17 00:00:00 2001 You can drop this line; it's just part of the mbox format. From: Shubham Chaudhary shubham.chaudh...@kdemail.net Date: Sat, 15 Mar 2014 05:56:18 +0530

[PATCH] shallow: verify shallow file after taking lock

2014-03-14 Thread Jeff King
Before writing the shallow file, we stat() the existing file to make sure it has not been updated since our operation began. However, we do not do so under a lock, so there is a possible race: 1. Process A takes the lock. 2. Process B calls check_shallow_file_for_update and finds no