[PATCH 7/6?] t4012: use 'printf' instead of 'dd' to generate a binary file

2012-07-12 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes on Windows instead of the expected 1026 bytes, so that a test fails. Since the actual contents of the file are irrelevant as long as there is at least one zero byte so that the diff

Re: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?)

2012-07-12 Thread Johannes Sixt
Am 7/12/2012 1:30, schrieb Junio C Hamano: - test $(wc -l actual) = 16 + test $(wc -l actual) = 16 We have a helper function for this: test_line_count = 16 actual -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 1/4 v8] config: read (but not write) from $XDG_CONFIG_HOME/git/config file

2012-07-12 Thread Thomas Rast
Hi all, This patch causes valgrind warnings in t1300.81 (get --path copes with unset $HOME) about passing NULL to access(): ==25286== Syscall param access(pathname) points to unaddressable byte(s) ==25286==at 0x56E2227: access (in /lib64/libc-2.14.1.so) ==25286==by 0x48CA42:

How can I append authentication with git push ?

2012-07-12 Thread J. Bakshi
Dear list, Is there any option to add user-name and password with git push ? Or any repo wise configuration file where I can save the info, so that it doesn't ask the credential before every push ? Thanks -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-12 Thread Miles Bader
Junio C Hamano gits...@pobox.com writes: is easier to understand, while I think git branch branch [start] git branch --set-upstream-to=upstream [branch] Isn't one problem with this that even if a --set-upstream-to option exists, inevitably some [and I'm guessing, many] people

Re: Git Garbage Collect Error.

2012-07-12 Thread Jeff King
On Wed, Jun 13, 2012 at 11:27:04AM +0100, Thomas Lucas wrote: Hopefully this is the right place to send bug reports... The community page http://git-scm.com/community; suggests that it is. It is the right place. Sorry that you did not get any response before now. During garbage collection

Re: [PATCH] config: fix several access(NULL) calls

2012-07-12 Thread Thomas Rast
Matthieu Moy matthieu@imag.fr writes: When $HOME is unset, home_config_paths fails and returns NULL pointers for user_config and xdg_config. Valgrind complains with Syscall param access(pathname) points to unaddressable byte(s). Don't call blindly access() on these variables, but test

Question: git clone --no-checkout behavior

2012-07-12 Thread Bryan Turner
I've witnessed the following behavior in both git 1.7.6 and 1.7.10.4. Assume I have a bare clone, some-repo.git. If I run: - git clone --shared --no-checkout /path/to/some-repo.git shared-repo - cd shared-repo - git status I see that every file in the repository is _staged_ for deletion. I'm not

Re: How can I append authentication with git push ?

2012-07-12 Thread Thiago Farina
On Thu, Jul 12, 2012 at 5:18 AM, J. Bakshi joydeep.bak...@infoservices.in wrote: Or any repo wise configuration file where I can save the info, so that it doesn't ask the credential before every push ? I'd like to know how to do that too. It's a pain to have to type username and password every

[PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Paul Gortmaker
If git am wasn't run with --reject, we assume the end user knows where to find the patch. This is normally true for a single patch, but if the user is processing a mbox with many patches, they may not have a single broken out patch handy. So, provide a helpful hint as to where they can find the

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-07-12 Thread Junio C Hamano
Miles Bader mi...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: is easier to understand, while I think git branch branch [start] git branch --set-upstream-to=upstream [branch] Isn't one problem with this that even if a --set-upstream-to option exists, inevitably

Re: [PATCH] submodules: don't stumble over symbolic links when cloning recursively

2012-07-12 Thread Johannes Sixt
Am 11.07.2012 23:08, schrieb Jens Lehmann: Am 11.07.2012 22:39, schrieb Johannes Sixt: At this point we can be in a subdirectory of the worktree. With cd_to_toplevel we move up in the directory hierarchy (cd out). Then a relative $gitdir or $sm_path now points to the wrong directory. No?

Re: [PATCH] config: fix several access(NULL) calls

2012-07-12 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: When $HOME is unset, home_config_paths fails and returns NULL pointers for user_config and xdg_config. Valgrind complains with Syscall param access(pathname) points to unaddressable byte(s). Don't call blindly access() on these variables, but test

Re: How can I append authentication with git push ?

2012-07-12 Thread Junio C Hamano
Thiago Farina tfrans...@gmail.com writes: On Thu, Jul 12, 2012 at 5:18 AM, J. Bakshi joydeep.bak...@infoservices.in wrote: Or any repo wise configuration file where I can save the info, so that it doesn't ask the credential before every push ? I'd like to know how to do that too. It's a

Re: Question: git clone --no-checkout behavior

2012-07-12 Thread Junio C Hamano
Bryan Turner btur...@atlassian.com writes: I've witnessed the following behavior in both git 1.7.6 and 1.7.10.4. Assume I have a bare clone, some-repo.git. If I run: - git clone --shared --no-checkout /path/to/some-repo.git shared-repo - cd shared-repo - git status I do not recall we

[PATCH v2] submodules: don't stumble over symbolic links when cloning recursively

2012-07-12 Thread Jens Lehmann
Since 69c3051 (submodules: refactor computation of relative gitdir path) cloning a submodule recursively fails for nested submodules when a symbolic link is part of the path to the work tree of the superproject. This happens when module_clone() tries to find the relative paths between the work

Export from bzr / Import to git results in a deleted file re-appearing

2012-07-12 Thread Felix Natter
hi, I am trying to move freeplane's repository (GPL-project) from bzr to git, but when I do this: $ mkdir freeplane-git1 $ cd freeplane-git1 $ git init . $ bzr fast-export --export-marks=../marks.bzr ../trunk/ | git fast-import --export-marks=../marks.git $ git checkout then there are no

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Paul Gortmaker
On 12-07-12 01:45 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: If git am wasn't run with --reject, we assume the end user knows where to find the patch. This is normally true for a single patch, Not at all. Whether it is a single or broken, the patch is

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: On 12-07-12 01:45 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: If git am wasn't run with --reject, we assume the end user knows where to find the patch. This is normally true for a single patch, Not at

Re: [PATCH] config: fix several access(NULL) calls

2012-07-12 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@imag.fr writes: When $HOME is unset, home_config_paths fails and returns NULL pointers for user_config and xdg_config. Valgrind complains with Syscall param access(pathname) points to unaddressable byte(s). Don't call

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Paul Gortmaker
On 12-07-12 02:53 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: On 12-07-12 01:45 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: If git am wasn't run with --reject, we assume the end user knows where to find the patch. This is

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: This is _NOT_ fine, especially if you suggest patch the user may not have, and more importantly does not have a clue why git apply rejected it (am does _not_ use patch at all). I'm not 100% sure I'm following what part here is not OK. If

Re: [PATCH] config: fix several access(NULL) calls

2012-07-12 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: + if (user_config access(user_config, R_OK) + xdg_config !access(xdg_config, R_OK)) given_config_file = xdg_config; Shouldn't we be using xdg_config, if user_config is NULL and xdg_config is

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Jeff King
On Thu, Jul 12, 2012 at 02:32:01PM -0400, Paul Gortmaker wrote: In case it helps any, a brief summary of my workflow is this: git am /tmp/mbox some random fail halfway in the queue patch -p1 --dry-run .git/rebase-apply/patch # gauge status. Is patch really invalid, or already applied? #

[PATCH] date.c: Fix off by one error in object-header date parsing

2012-07-12 Thread Junio C Hamano
It is perfectly OK for a valid decimal integer to begin with '9' but 116eb3a (parse_date(): allow ancient git-timestamp, 2012-02-02) did not express the range correctly. Signed-off-by: Junio C Hamano gits...@pobox.com --- date.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-12 Thread Jeff King
On Thu, Jul 12, 2012 at 08:00:17PM +0200, Felix Natter wrote: I am trying to move freeplane's repository (GPL-project) from bzr to git, but when I do this: $ mkdir freeplane-git1 $ cd freeplane-git1 $ git init . $ bzr fast-export --export-marks=../marks.bzr ../trunk/ | git fast-import

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: I think this is where our two thinking paths diverge. You are suggesting I edit and fix the patch. Yes, occasionally I do that, if it is a trivial context change. But hand editing a patch is not for Joe Average, and gets very complicated

[PATCH] Re: git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Nicolas Sebrecht
The 12/07/12, Junio C Hamano wrote: It does not matter at all that 0001-foo.patch only has a single patch. If you are going to fix up the patch after you saw git am failed, you will be fixing .git/rebase-apply/patch with your editor and re-run git am without arguments, at which point git am

Re: [PATCH] Re: git-am: indicate where a failed patch is to be found.

2012-07-12 Thread Junio C Hamano
Nicolas Sebrecht nicolas.s@gmx.fr writes: The 12/07/12, Junio C Hamano wrote: It does not matter at all that 0001-foo.patch only has a single patch. If you are going to fix up the patch after you saw git am failed, you will be fixing .git/rebase-apply/patch with your editor and re-run

Re: Question: git clone --no-checkout behavior

2012-07-12 Thread Junio C Hamano
Bryan Turner btur...@atlassian.com writes: If you populated $GIT_DIR/index from the tree of HEAD, you would see everything is deleted in the working tree. You can simulate it by doing this: git clone -n $over_there here cd here git read-tree HEAD git

git cloning paths

2012-07-12 Thread Douglas Garstang
All, I'm a relative newcomer to git and I've just inherited a setup where all of the company's code is in a single git repository. Within this repository are multiple projects. It seems that git doesn't natively allow cloning/checking out of individual paths within the repo (ie projects), which

Re: [PATCH 7/6?] t4012: use 'printf' instead of 'dd' to generate a binary file

2012-07-12 Thread Alexander Strasser
Hi, Johannes Sixt wrote: From: Johannes Sixt j...@kdbg.org For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes on Windows instead of the expected 1026 bytes, so that a test fails. Since the actual contents of the file are irrelevant as long as there is at least one

Re: [PATCH 3/6] t4012: Actually quote the sed script

2012-07-12 Thread Alexander Strasser
Hi Zbigniew, Zbigniew Jędrzejewski-Szmek wrote: On 07/12/2012 12:12 AM, Alexander Strasser wrote: [...] I have some spelling corrections (minor, but since you intend to re-roll anyway, I'll post them), and one more thing which could be corrected (below). 3/6: s/Never the less/Nevertheless/

[PATCHv2 0/2] git p4: use move command for renames

2012-07-12 Thread Pete Wyckoff
Difference from v1: * Remove tee usage in t9814, just send output to a file and grep it directly. Recent p4 supports a move command that records explicitly that a file was moved from one place to another. It can be changed a bit during the move, too. Use this feature, if it exists,

[PATCHv2 1/2] git p4: refactor diffOpts calculation

2012-07-12 Thread Pete Wyckoff
From: Gary Gibbons ggibb...@perforce.com P4Submit.applyCommit() To avoid recalculating the same diffOpts for each commit, move it out of applyCommit() and into the top-level run(). Also fix a bug in that code which interpreted the value of detectRenames as a string rather than as a boolean.

[PATCHv2 2/2] git p4: add support for 'p4 move' in P4Submit

2012-07-12 Thread Pete Wyckoff
From: Gary Gibbons ggibb...@perforce.com For -M option (detectRenames) in P4Submit, use 'p4 move' rather than 'p4 integrate'. Check Perforce server for exisitence of 'p4 move' and use it if present, otherwise revert to 'p4 integrate'. [pw: wildcard-encode src/dest, add/update tests, tweak code]