Re: [PATCH 5/6] remote.c: introduce remote.pushdefault

2013-03-27 Thread Ramkumar Ramachandra
Jeff King wrote: but also possibly just move it with the other remote parsing, like: [...] Done. Thanks for the dose of sanity. -- 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

[PATCH] Fixed typo in git-pull manual

2013-03-27 Thread Mihai Capotă
Signed-off-by: Mihai Capotă mi...@mihaic.ro --- Documentation/git-pull.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c975743..eec4c1d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt

Re: Composing git repositories

2013-03-27 Thread Ramkumar Ramachandra
Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in that sense, the repositories are *not* owned by the superproject in any way. However, you are working within the context

Re: git ate my home directory :-(

2013-03-27 Thread Duy Nguyen
On Tue, Mar 26, 2013 at 10:04 PM, Jeff King p...@peff.net wrote: specifies a path to use instead of the default `.git` for the base of the repository. The '--git-dir' command-line option also sets this value. + If neither GIT_WORK_TREE nor '--work-tree' is set, the +

[BUG gitk] notes not reloaded on Update/Reload

2013-03-27 Thread Uwe Kleine-König
Hello, running gitk from Debian (1:1.8.2~rc3-1) I noticed that $ gitk ... $ git notes edit $some_ref_shown_by_gitk and then pressing F5 or Shift-F5 doesn't update the notes shown. Best regards Uwe PS: Please Cc: on replies as I'm not subscribed -- Pengutronix e.K.

[BUG gitk] strange scrolling behaviour if history canvas not completely filled

2013-03-27 Thread Uwe Kleine-König
Hello, (running gitk from Debian's gitk 1:1.8.2~rc3-1 package) if only a few commits are shown in gitk such that the history canvas is too big, i.e. there is place for more commits to be shown, the scroll bar on the right hand side correctly is greyed out. Still I can scroll using the mouse

[PATCH] gitk: Move hard-coded colors to .gitk

2013-03-27 Thread Gauthier Östervall
Colors that are changeable in Preferences gave no sufficient control, putting colors in the config file allows for easier configuration and sharing of color schemes. win32: Make the default foreground color that of window text rather than button text. Signed-off-by: Gauthier Östervall

Re: merge help

2013-03-27 Thread Magnus Bäck
On Tuesday, March 26, 2013 at 18:07 EDT, J.V. jvsr...@gmail.com wrote: I have a branch for which I have made 0 (nada) changes. I did the following: $git pull --rebase --no-stat -v --progress origin mybranch I get the following U java/Profile.java Pull is not possible

[PATCH] Enhance git-commit doc for multiple `-m` options

2013-03-27 Thread Christian Helmuth
The text is copied from Documentation/git-tag.txt. Signed-off-by: Christian Helmuth christian.helm...@genode-labs.com --- Documentation/git-commit.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 24a99cc..05f8297 100644

Re: [PATCH] git-web--browse: recognize iTerm as a GUI terminal on OS X

2013-03-27 Thread Junio C Hamano
John Szakmeister j...@szakmeister.net writes: Sorry about the repeat Junio, I meant to hit Reply to All. On Mon, Mar 25, 2013 at 5:44 PM, Junio C Hamano gits...@pobox.com wrote: [snip] Your patch makes me wonder if test -n $TERM_PROGRAM without any SECURITYSESSIONID or explicit

[PATCH v2] log: Read gpg settings for signed commit verification

2013-03-27 Thread Hans Brigman
From: Jacob Sarvisjsar...@openspan.com log: Read gpg settings for signed commit verification Commit signature verification fails when alternative gpg.program signs the commit, but gpg attempts to verify the signature. show --show-signature and log --show-signature do not read the gpg.program

Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
I am experiencing a segmentation fault in various versions of Git using different repositories. Specifically, I have reproduced it using a public repo and the latest stable Git version. Other repos trigger the error on different versions. Full info can be found below. Thanks, Charlie Test

Re: [PATCH v2 00/45] parse_pathspec and :(glob) magic

2013-03-27 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sat, Mar 23, 2013 at 10:13 AM, Duy Nguyen pclo...@gmail.com wrote: which also includes all document bugs reported so far. s/all/fixes for all/ Slurped from your github repository and didn't find anything questionable relative to the original series

Re: propagating repo corruption across clone

2013-03-27 Thread Sitaram Chamarty
On Wed, Mar 27, 2013 at 8:33 PM, Junio C Hamano gits...@pobox.com wrote: Sitaram Chamarty sitar...@gmail.com writes: On Wed, Mar 27, 2013 at 9:17 AM, Junio C Hamano gits...@pobox.com wrote: To be paranoid, you may want to set transfer.fsckObjects to true, perhaps in your ~/.gitconfig. do

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread thomas
Charlie Smurthwaite char...@atechmedia.com writes: I am experiencing a segmentation fault in various versions of Git using different repositories. Specifically, I have reproduced it using a public repo and the latest stable Git version. Other repos trigger the error on different versions.

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 04:53:27PM +0100, thomas wrote: Charlie Smurthwaite char...@atechmedia.com writes: I am experiencing a segmentation fault in various versions of Git using different repositories. Specifically, I have reproduced it using a public repo and the latest stable Git

Re: Composing git repositories

2013-03-27 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in that sense, the repositories are *not* owned by the superproject in any

Re: [PATCH] Fixed typo in git-pull manual

2013-03-27 Thread Junio C Hamano
Mihai Capotă mi...@mihaic.ro writes: Signed-off-by: Mihai Capotă mi...@mihaic.ro --- Thanks. It might be better to make it which resulted in complex conflicts, though. Documentation/git-pull.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH v2] log: Read gpg settings for signed commit verification

2013-03-27 Thread Junio C Hamano
Hans Brigman hbrig...@openspan.com writes: Content-Type: multipart/mixed; boundary=_002_8C726954D36902459248B0627BF2E66F45D70C3E4EAUSP01VMBX10c_ No multipart/anything please. We prefer to see text/plain. In general, please follow Documentation/SubmittingPatches. From: Jacob

Re: [PATCH] config: Consistent call style to gpg settings

2013-03-27 Thread Junio C Hamano
Hans Brigman hbrig...@openspan.com writes: From: Jacob Sarvis jsar...@openspan.com config: Consistent call style to gpg settings Calling style for passing settings to git_gpg_config is inconsistent between commit-tree, commit, merge, tag, and verify-tag. Consolidate style of calling

Re: [PATCH 00/15] Use test_config

2013-03-27 Thread Yann Droneaud
Hi, Le 27.03.2013 16:05, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266 Is this because I suggested you to clean things up while you were touching in a vicinity of something that could use this clean-up?

Re: [PATCH v2] log: Read gpg settings for signed commit verification

2013-03-27 Thread Jeff King
On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: } - + if (git_gpg_config(var, value, cb) 0) + return -1; if (grep_config(var, value, cb) 0) return -1; Hmph. I do not particularly like the way the call to grep_config() loses

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

2013-03-27 Thread Junio C Hamano
Eric Wong normalper...@yhbt.net writes: Sebastian Schuberth sschube...@gmail.com wrote: This originates from an msysgit pull request, see: https://github.com/msysgit/git/pull/58 Signed-off-by: Eric Wieser wieser.e...@gmail.com Signed-off-by: Sebastian Schuberth sschube...@gmail.com

Re: [PATCH] Enhance git-commit doc for multiple `-m` options

2013-03-27 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Looks like a simple typo in merge-tree.c::unresolved: Thanks. -- 8 -- merge-tree: fix typo in merge-tree.c::unresolved When calculating whether there is a d/f conflict, the calculation of whether both sides are directories generates an incorrect

git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Jim Kinsman
git status takes 30 seconds on Windows 7. Here are some stats: git ls-files | wc -l 27330 git ls-files -o | wc -l 4 $ git diff --name-only | xargs du -chs 68K update_import_contacts.php 68K total What can I do??? This is so slow it is unbearable. By the way i've done git gc several

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Andreas Ericsson
On 03/27/2013 05:39 PM, Jim Kinsman wrote: git status takes 30 seconds on Windows 7. Here are some stats: git ls-files | wc -l 27330 git ls-files -o | wc -l 4 $ git diff --name-only | xargs du -chs 68K update_import_contacts.php 68K total What can I do??? This is so slow it

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Konstantin Khomoutov
On Wed, 27 Mar 2013 11:39:31 -0500 Jim Kinsman jakins...@gmail.com wrote: git status takes 30 seconds on Windows 7. Here are some stats: [...] What can I do??? This is so slow it is unbearable. By the way i've done git gc several times and nothing changed. You could try some voodoo [1] or

Re: Composing git repositories

2013-03-27 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in that sense, the repositories are *not* owned by

Re: [PATCH v2] log: Read gpg settings for signed commit verification

2013-03-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: } - + if (git_gpg_config(var, value, cb) 0) + return -1; if (grep_config(var, value, cb) 0) return -1; Hmph. I do not particularly like the way the call

RE: Rename conflicts in the index

2013-03-27 Thread Edward Thomson
Junio C Hamano [mailto:gits...@pobox.com] wrote: Edward Thomson ethom...@microsoft.com writes: I would propose that this not simply track rename conflicts, but all conflicts. That is a no starter. So. Can you explain to me why this would be a non starter? Can you suggest some alternate

[PATCH v2] Fixed typo in git-pull manual

2013-03-27 Thread Mihai Capotă
Signed-off-by: Mihai Capotă mi...@mihaic.ro --- Documentation/git-pull.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c975743..24ab07a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Junio C Hamano
Charlie Smurthwaite char...@atechmedia.com writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d

Re: [PATCH] git-send-email.perl: implement suggestions made by perlcritic

2013-03-27 Thread Ramkumar Ramachandra
Junio, I don't see this queued in 'pu'. Do you have any objections to the patch, or did you just forget? Thanks. -- 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: Composing git repositories

2013-03-27 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Sorry, I'm deviating. I learnt why you think the hack is necessary and not too wrong. OK. As I explained above, the entire design is asymmetric and inelegant; I think we can do much better than this. I personally find the explained above

[PATCH v2] config: Consistent call style to gpg settings

2013-03-27 Thread Hans Brigman
From: Jacob Sarvis jsar...@openspan.com Calling style for passing settings to git_gpg_config is inconsistent between commit-tree, commit, log, merge, tag, and verify-tag. Consolidate style of calling git_gpg_config. Signed-off-by: Jacob Sarvis jsar...@openspan.com Signed-off-by: Hans Brigman

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Rob Hoelz
On Wed, 20 Mar 2013 07:35:58 -0700 Junio C Hamano gits...@pobox.com wrote: Rob Hoelz r...@hoelz.ro writes: On 3/19/13 7:08 PM, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: Test nits: ... Hope

[PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Rob Hoelz
git push currently doesn't consider pushInsteadOf when using pushurl; this test tests that. If you use pushurl with an alias that has a pushInsteadOf configuration value, Git does not take advantage of it. For example: [url git://github.com/] insteadOf = github: [url

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 11:39:31AM -0500, Jim Kinsman wrote: git status takes 30 seconds on Windows 7. Here are some stats: git ls-files | wc -l 27330 git ls-files -o | wc -l 4 $ git diff --name-only | xargs du -chs 68K update_import_contacts.php 68K total What can I do???

Re: Rename conflicts in the index

2013-03-27 Thread Junio C Hamano
Edward Thomson ethom...@microsoft.com writes: Junio C Hamano [mailto:gits...@pobox.com] wrote: Edward Thomson ethom...@microsoft.com writes: I would propose that this not simply track rename conflicts, but all conflicts. That is a no starter. So. Can you explain to me why this would

Re: [PATCH] git-send-email.perl: implement suggestions made by perlcritic

2013-03-27 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: I don't see this queued in 'pu'. Do you have any objections to the patch, or did you just forget? I do not recall the details but I think I was expecting a re-roll updating the log message (if the original invited questions, there must have been

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 17:06, Junio C Hamano wrote: Charlie Smurthwaite char...@atechmedia.com writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f

Re: [PATCH v2] Fixed typo in git-pull manual

2013-03-27 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Jed Brown
Charlie Smurthwaite char...@atechmedia.com writes: I am also using this to obtain a diff that would be applied if a merge were to be run. Is there a better way to obtain this information that is more commonly used? You can do an actual merge using detached HEAD: $ git checkout --detach

Re: [PATCH] git-svn: Support custom tunnel schemes instead of SSH only

2013-03-27 Thread Eric Wong
Junio C Hamano gits...@pobox.com wrote: Eric Wong normalper...@yhbt.net writes: git-svn: Support custom tunnel schemes instead of SSH only (2013-03-27 04:28:04 +) Thanks. Will pull. By the way, did nobody in the patch chain find the log message problematic? It does not give

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Jim Kinsman
The only anti-virus I have installed is Microsoft Security Essentials I turned off and it was still the same: $ cat /usr/bin/gitstatus start_time=`date +%s` git status echo run time is $(expr `date +%s` - $start_time) s $ gitstatus # On branch test # Changes not staged for commit: # (use git

Re: propagating repo corruption across clone

2013-03-27 Thread Rich Fromm
Jonathan Nieder-2 wrote Is the [transfer] fsckObjects configuration on the host executing the clone set to true? I hadn't been setting it at all, and according to git-config(1) it defaults to false, so the answer is no. It looks like setting it might be a good idea. But I'm still somewhat

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Jonathan Nieder
Rob Hoelz wrote: --- a/remote.c +++ b/remote.c @@ -465,7 +465,11 @@ static void alias_all_urls(void) if (!remotes[i]) continue; for (j = 0; j remotes[i]-pushurl_nr; j++) { - remotes[i]-pushurl[j] =

Re: propagating repo corruption across clone

2013-03-27 Thread Rich Fromm
Junio C Hamano wrote If you use --local, that is equivalent to cp -R. Your corruption in the source will faithfully be byte-for-byte copied to the destination. If you do not ... transport layer will notice object corruption. ... The difference between --mirror and no --mirror is a red

Re: Git and GSoC 2013

2013-03-27 Thread Jonathan Nieder
Jeff King wrote: There was a big thread about a month ago on whether Git should do Google Summer of Code this year[1]. [...] In my opinion, a lot of the issues come down to project selection; Let me throw in some other issues. :) * I think the git project has been very disorganized in

RE: Rename conflicts in the index

2013-03-27 Thread Edward Thomson
Junio C Hamano [mailto:gits...@pobox.com] wrote: We do not gratuitously break existing implementations. If no conflict is stored as higher-stage index entries in an index that has your index extension, no existing implementation can read a conflicted index written by your implementation and

more git weirdness (git rebase, merge conflicts

2013-03-27 Thread J.V.
I have a local/development branch tracked to origin/development. I made no changes to local/dev and did a git pull with rebase, I did not expect any conflicts. I got a conflict and was thrown onto another branch. I attempted a merge (using IntelliJ) accepting everything from the server but

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Jeff King
On Wed, Mar 27, 2013 at 06:46:57PM +, John Keeping wrote: I think the simple reality is that Git was written with the assumption that stat is cheap and that isn't really the case on Windows, where the filesystem cache doesn't seem to do that well with this. Yes, I think that's pretty much

Re: propagating repo corruption across clone

2013-03-27 Thread Junio C Hamano
Rich Fromm richard_fr...@yahoo.com writes: Apologies if my questions are considered slightly off topic -- I'm not positive if this is supposed to be a list for developers, and not users. The list is both for users and developers. However, I think there may be room for some additional clarity

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Jed Brown
Charlie Smurthwaite char...@atechmedia.com writes: Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server, you don't want this to be observable, so you don't want HEAD to move around. I don't know a better way than: $ git clone --shared -b

Re: Composing git repositories

2013-03-27 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Even then, working with one worktree embedded inside another is something git never designed for: it explains why I have to literally fight with git when using submodules Do you mean that you wish you could ignore subrepository boundaries and

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Linus Torvalds
On Wed, Mar 27, 2013 at 12:04 PM, Jeff King p...@peff.net wrote: Yes, I think that's pretty much the case (though most of my Git-on-Windows experience is from cygwin long ago, where the stat performance was truly horrendous). Have you tried setting core.preloadindex, which should run the

Re: Rename conflicts in the index

2013-03-27 Thread Junio C Hamano
Edward Thomson ethom...@microsoft.com writes: Junio C Hamano [mailto:gits...@pobox.com] wrote: We do not gratuitously break existing implementations. If no conflict is stored as higher-stage index entries in an index that has your index extension, no existing implementation can read a

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: Charlie Smurthwaite char...@atechmedia.com writes: Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server, you don't want this to be observable, so you don't want HEAD to move around. I

Re: propagating repo corruption across clone

2013-03-27 Thread Jeff King
On Wed, Mar 27, 2013 at 11:23:15AM -0700, Rich Fromm wrote: But I'm still somewhat confused about what is and is not checked under what conditions. Consider the three statements: # 1 git clone --mirror myuser@myhost:my_repo # 2 git clone --mirror --config transfer.fsckObjects=true

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Junio C Hamano
Linus Torvalds torva...@linux-foundation.org writes: On Wed, Mar 27, 2013 at 12:04 PM, Jeff King p...@peff.net wrote: Yes, I think that's pretty much the case (though most of my Git-on-Windows experience is from cygwin long ago, where the stat performance was truly horrendous). Have you

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Jeff King
On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote: On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: Charlie Smurthwaite char...@atechmedia.com writes: Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server, you don't

[PATCH v3 0/3] Recursion-free unpack_entry and packed_object_info

2013-03-27 Thread Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch Almost the same as last time. Changed: the rename suggested by Junio The only little concern I may have is this cmp_* function tells us I found it! by returning true, which is counter-intuitive to the readers of the caller (not the callee). I think it

[PATCH v3 1/3] sha1_file: remove recursion in packed_object_info

2013-03-27 Thread Thomas Rast
packed_object_info() and packed_delta_info() were mutually recursive. The former would handle ordinary types and defer deltas to the latter; the latter would use the former to resolve the delta base. This arrangement, however, leads to trouble with threaded index-pack and long delta chains on

[PATCH v3 3/3] sha1_file: remove recursion in unpack_entry

2013-03-27 Thread Thomas Rast
Similar to the recursion in packed_object_info(), this leads to problems on stack-space-constrained systems in the presence of long delta chains. We proceed in three phases: 1. Dig through the delta chain, saving each delta object's offsets and size on an ad-hoc stack. 2. Unpack the base

Re: git status takes 30 seconds on Windows 7. Why?

2013-03-27 Thread Linus Torvalds
On Wed, Mar 27, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote: Given that we haven't tweaked the parallelism or thread-cost parameters since the inception of the mechanism in Nov 2008, I suspect that we would see praises from some and grievances from other corners of the user base

Re: Composing git repositories

2013-03-27 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Ramkumar Ramachandra wrote: Even then, working with one worktree embedded inside another is something git never designed for: it explains why I have to literally fight with git when using submodules Do you mean that you wish

Re: [PATCH 5/9] add test for streaming corrupt blobs

2013-03-27 Thread Jeff King
On Mon, Mar 25, 2013 at 04:21:34PM -0400, Jeff King wrote: +# Convert byte at offset $2 of object $1 into '\0' +corrupt_byte() { + obj_file=$(obj_to_file $1) + chmod +w $obj_file + printf '\0' | dd of=$obj_file bs=1 seek=$2 +} Hmm, this last line should probably be: diff

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: I was kind of surprised to see this still in pu, too. I thought it was supposed to cook in next for a while to shake out any interoperability bugs (and it was in next previously). Did it get ejected after the release and then never put back? Yes, I've been

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread Thomas Rast
Jeff King p...@peff.net writes: On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: [Cooking] [...] * jk/index-pack-correct-depth-fix (2013-03-20) 1 commit - index-pack: always zero-initialize object_entry list index-pack --fix-thin used uninitialize value to compute delta

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread Jeff King
On Wed, Mar 27, 2013 at 01:50:29PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: I was kind of surprised to see this still in pu, too. I thought it was supposed to cook in next for a while to shake out any interoperability bugs (and it was in next previously). Did it get

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 20:01, Jeff King wrote: On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote: On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: Charlie Smurthwaite char...@atechmedia.com writes: Yes, I would need to be able to do this on a bare repo for my use case. And if

which files will have conflicts between two branches?

2013-03-27 Thread J.V.
I have two local branches (tracked to remote) that are in sync (did a git pull on both branches from their corresponding remote). Is this the best way to merge? I would be merging local/branch1 = local/branch2 (test this branch) and then push local/branch2 = origin/branch1 (and would expect

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Sorry, typo. The configuration in the example above should have been [url git://anongit.myserver.example.com/] insteadOf = myserver.example.com: [url myserver.example.com:] pushInsteadOf =

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits (merged to 'next' on 2013-03-19 at e68014a) + difftool --dir-diff: symlink all files matching the working tree + difftool: avoid double slashes in symlink targets +

Re: Git and GSoC 2013

2013-03-27 Thread Christian Couder
On Wed, Mar 27, 2013 at 7:52 PM, Jonathan Nieder jrnie...@gmail.com wrote: Jeff King wrote: There was a big thread about a month ago on whether Git should do Google Summer of Code this year[1]. I think we should do it. It looks strange to me to say that students are great and at the same

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits (merged to 'next' on 2013-03-19 at e68014a) + difftool --dir-diff: symlink all files matching the working tree + difftool:

[PATCH] use refnames instead of left/right in dirdiffs

2013-03-27 Thread Christoph Anton Mitterer
Currently, when a dir-diff is made with git-difftool the two revisions are stored in two temporary directories .../left and .../right. Many difftools show these pathnames in ther UI and therefore it would be helpful for users, if actual reference names specified as progam arguments was used

jn/add-2.0-u-A-sans-pathspec (Re: What's cooking in git.git (Mar 2013, #07; Tue, 26))

2013-03-27 Thread Jonathan Nieder
Junio C Hamano wrote: On Tue, Mar 26, 2013 at 03:40:00PM -0700, Junio C Hamano wrote: * jn/add-2.0-u-A-sans-pathspec (2013-03-20) 5 commits - git add: -u/-A now affects the entire working tree - add -A: only show pathless 'add -A' warning when changes exist outside cwd - add -u: only show

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Rob Hoelz
On Wed, 27 Mar 2013 15:07:18 -0700 Junio C Hamano gits...@pobox.com wrote: Jonathan Nieder jrnie...@gmail.com writes: Sorry, typo. The configuration in the example above should have been [url git://anongit.myserver.example.com/] insteadOf = myserver.example.com:

Re: What's cooking in git.git (Mar 2013, #07; Tue, 26)

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 03:15:44PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits (merged to 'next' on 2013-03-19 at e68014a) + difftool

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Rob Hoelz
On Wed, 27 Mar 2013 15:47:35 -0700 Jonathan Nieder jrnie...@gmail.com wrote: Hi, Rob Hoelz wrote: On Wed, 27 Mar 2013 11:23:45 -0700 Jonathan Nieder jrnie...@gmail.com wrote: Suppose I configure [url git://anongit.myserver.example.com/] insteadOf =

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Jonathan Nieder
Rob Hoelz wrote: My mistake; I had not seen it! I thought you may have found a bug in my implementation, so I wanted to double check. =) Well, I had found an unfortunate consequence of the implementation that uses an unnecessary copy. :) Will follow up to the updated patch. -- To unsubscribe

Re: [PATCH] merge-tree: fix same file added in subdir

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 03:42:40PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: When the same file is added with identical content at the top level, git-merge-tree prints added in both with the details. But if the file is added in an existing subdirectory,

Re: Composing git repositories

2013-03-27 Thread Jens Lehmann
Am 27.03.2013 18:02, schrieb Ramkumar Ramachandra: Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Rob Hoelz
On Wed, 27 Mar 2013 15:56:56 -0700 Jonathan Nieder jrnie...@gmail.com wrote: Rob Hoelz wrote: My mistake; I had not seen it! I thought you may have found a bug in my implementation, so I wanted to double check. =) Well, I had found an unfortunate consequence of the implementation that

Re: [PATCH] use refnames instead of left/right in dirdiffs

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 11:13:17PM +0100, Christoph Anton Mitterer wrote: Currently, when a dir-diff is made with git-difftool the two revisions are stored in two temporary directories .../left and .../right. Many difftools show these pathnames in ther UI and therefore it would be helpful

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Josh Triplett
On Wed, Mar 27, 2013 at 05:48:45PM -0500, Rob Hoelz wrote: On Wed, 27 Mar 2013 15:07:18 -0700 Junio C Hamano gits...@pobox.com wrote: Jonathan Nieder jrnie...@gmail.com writes: Sorry, typo. The configuration in the example above should have been [url

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Josh Triplett
On Wed, Mar 27, 2013 at 04:09:43PM -0700, Josh Triplett wrote: On Wed, Mar 27, 2013 at 05:48:45PM -0500, Rob Hoelz wrote: On Wed, 27 Mar 2013 15:07:18 -0700 Junio C Hamano gits...@pobox.com wrote: Jonathan Nieder jrnie...@gmail.com writes: Sorry, typo. The configuration in the

Re: [PATCH] push: Alias pushurl from push rewrites

2013-03-27 Thread Jonathan Nieder
Josh Triplett wrote: I have a .gitconfig in my git-managed home directory which sets pushInsteadOf so that I can clone via git:// and immediately have working push. I work with a number of systems that don't have inbound access to each other but do have outbound access

[PATCH] git help config: s/insn/instruction/

2013-03-27 Thread Matthias Krüger
insn appears to be an in-code abbreviation and should not appear in manual/help pages. --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index c1f435f..f79184c 100644 --- a/Documentation/config.txt

[PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

2013-03-27 Thread John Koleszar
Filter the list of refs returned via the dumb HTTP protocol according to the active namespace, consistent with other clients of the upload-pack service. Signed-off-by: John Koleszar jkoles...@google.com --- http-backend.c | 8 +--- t/lib-httpd/apache.conf | 5 +

Re: [PATCH] git help config: s/insn/instruction/

2013-03-27 Thread Junio C Hamano
Matthias Krüger matthias.krue...@famsik.de writes: insn appears to be an in-code abbreviation and should not appear in manual/help pages. --- Thanks; sign-off? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo