Re: cherry-pick and 'log --no-walk' and ordering

2012-08-11 Thread Junio C Hamano
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes: On Fri, Aug 10, 2012 at 2:38 PM, Junio C Hamano gits...@pobox.com wrote: Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes: There is also cherry-pick/revert, which I _think_ does not really want the revisions sorted.

[PATCH v2] Let submodule command exit with error status if path does not exist

2012-08-11 Thread Heiko Voigt
Previously the exit status of git submodule was zero for various subcommands even though the user specified an unknown path. The reason behind that was that they all pipe the output of module_list into the while loop which then does the action on the paths specified by the commandline. Since the

[PATCH] help: correct behavior for is_executable on Windows

2012-08-11 Thread Heiko Voigt
The previous implementation said that the filesystem information on Windows is not reliable to determine whether a file is executable. To find gather this information it was peeking into the first two bytes of a file to see whether it looks executable. Apart from the fact that on Windows

Re: Porting git to HP NonStop

2012-08-11 Thread Johannes Sixt
Am 10.08.2012 18:27, schrieb Shawn Pearce: There is no need to define your own mmap(). Define NO_MMAP=1 in the Makefile. Git already has its own fake mmap and knows how to write it back to disk when making changes. Or better to say: the fake mmap has functionality that is sufficient for git.

Re: Bringing a bit more sanity to $GIT_DIR/objects/info/alternates?

2012-08-11 Thread Hallvard Breien Furuseth
Junio C Hamano wrote: Some ideas: - Make clone --reference without -s not to borrow from the reference repository. (...) Generalize: Introduce volatile alternate object stores. Commands like (remote) fetch, repack, gc will copy desired objects they see there. That allows

Re: Git hangs on clone

2012-08-11 Thread Paul Alesius
I should add to the facts that: - git version: git version 1.7.11.2 - Happens only when using protocols git:// and have seen it with https:// too, but never with http:// - Saw a similar issue here: http://code.google.com/p/msysgit/issues/detail?id=361 On 11 August 2012 04:48, Paul Alesius

[PATCH] i18n: mark progress strings for translation

2012-08-11 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I know it's late in the cycle so let's queue it for the next one before I forget it. I'm after the done\n in index-pack but we should also make it possible to translate units (especially bytes which is plural). There are ellipsis

Re: Git hangs on clone

2012-08-11 Thread Elia Pinto
Difficult that it is a git problem. It is better to trace the network communication, a wireshark trace for example. But it is probably a firewall or UTM, if you have, issue. Best 2012/8/11, Paul Alesius p...@unnservice.com: I should add to the facts that: - git version: git version 1.7.11.2

Re: Localization: Timestamps get wrong if using different locales

2012-08-11 Thread Christoph Miebach
Hello! What I am doing is: invoking a bash script that does the git add ${i##$TXPATH/}/strings.xml git commit --author=$AUTHOR ${i##$TXPATH\/}/strings.xml -m l10n: $LNAME update after a user confirmation. IIUC setting LANGUAGE=en at the top of this script _did_ help. So I run everything

[PATCH 0/5] git p4: fix branch detection with --use-client-spec

2012-08-11 Thread Pete Wyckoff
matt...@korich.net wrote on Fri, 10 Aug 2012 12:14 -0700: Using git p4 on git version 1.7.12.rc2 has path issues. Standard clone/sync ops apparently place detected master and branches on independent and parallel directory structures instead of git branches. See

[PATCH 1/5] git p4 test: move client_view() function to library

2012-08-11 Thread Pete Wyckoff
This code will be useful in --detect-branches --use-client-spec tests. Signed-off-by: Pete Wyckoff p...@padd.com --- t/lib-git-p4.sh | 18 ++ t/t9809-git-p4-client-view.sh | 17 - 2 files changed, 18 insertions(+), 17 deletions(-) diff --git

[PATCH 2/5] git p4 test: add broken --use-client-spec --detect-branches tests

2012-08-11 Thread Pete Wyckoff
Signed-off-by: Pete Wyckoff p...@padd.com --- t/t9801-git-p4-branch.sh | 77 1 file changed, 77 insertions(+) diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 99fe16b..ca3a7f9 100755 --- a/t/t9801-git-p4-branch.sh +++

[PATCH 3/5] git p4: set self.branchPrefixes in initialization

2012-08-11 Thread Pete Wyckoff
This instance variable is needed during commit() to map files from p4 to their relative locations in git. Set it when initializing P4Sync to avoid passing it to every commit() call. Signed-off-by: Pete Wyckoff p...@padd.com --- git-p4.py | 25 ++--- 1 file changed, 14

[PATCH 4/5] git p4: do wildcard decoding in stripRepoPath

2012-08-11 Thread Pete Wyckoff
Instead of having to remember to do it after each call to stripRepoPath, make it part of that function. Signed-off-by: Pete Wyckoff p...@padd.com --- git-p4.py | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/git-p4.py b/git-p4.py index 6d07115..e20ff5d

[PATCH 5/5] git p4: make branch detection work with --use-client-spec

2012-08-11 Thread Pete Wyckoff
The bug report in http://stackoverflow.com/questions/11893688 observes that files are mapped into the wrong locations in git when both --use-client-spec and --branch-detection are enabled. Fix this by changing the relative path prefix to match discovered branches when using a client spec. The

[PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude

2012-08-11 Thread Steven Walter
This fixes a bug where git finds the incorrect merge parent. Consider a repository with trunk, branch1 of trunk, and branch2 of branch1. Without this change, git interprets a merge of branch2 into trunk as a merge of branch1 into trunk. Signed-off-by: Steven Walter stevenrwal...@gmail.com ---

[PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip

2012-08-11 Thread Steven Walter
Consider the case where you have trunk, branchA of trunk, and branchB of branchA. trunk is merged back into branchB, and then branchB is reintegrated into trunk. The merge of branchB into trunk will have svn:mergeinfo property references to both branchA and branchB. When performing the

Re: git archive --format zip utf-8 issues

2012-08-11 Thread René Scharfe
Am 11.08.2012 00:47, schrieb Junio C Hamano: Sven Strickroth sven.strickr...@tu-clausthal.de writes: when I create a git repository, add a file containing utf-8 characters or umlauts (like öäü.txt), commit and then export the HEAD revision to a zip archive using git archive --format zip -o

Re: git archive --format zip utf-8 issues

2012-08-11 Thread René Scharfe
Am 11.08.2012 01:53, schrieb Sven Strickroth: Am 11.08.2012 00:47 schrieb Junio C Hamano: Do you know in what encoding the pathnames are _expected_ to be stored in zip archives? re-encoding to latin1 does not always work and may break double byte totally (e.g. chinese or japanese). PKZIP

Re: git archive --format zip utf-8 issues

2012-08-11 Thread Sven Strickroth
Am 11.08.2012 22:53 schrieb René Scharfe: The standard says we need to convert to CP437, or to UTF-8, or provide both versions. A more interesting question is: What's supported by which programs? The ZIP functionality built into Windows 7 doesn't seem to work with UTF-8 encoded filenames

Re: git archive --format zip utf-8 issues

2012-08-11 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: PKZIP APPNOTE seems to be the zip standard and it specifies a utf-8 flag: http://www.pkware.com/documents/casestudies/APPNOTE.TXT A. Local file header: general purpose bit flag: (2 bytes) Bit 11: Language encoding flag (EFS). If this bit is

Re: git archive --format zip utf-8 issues

2012-08-11 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: ... A more interesting question is: What's supported by which programs? Yes, that is the most interesting question. Of course, git archive --format=zip --path-reencode=utf8-to-latin1 would be the most generic way to do this. I really hope

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-11 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: help.c | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/help.c b/help.c index 662349d..b41fa21 100644 --- a/help.c +++ b/help.c @@ -103,10 +103,19 @@ static int is_executable(const char *name) return

Re: [PATCH] i18n: mark progress strings for translation

2012-08-11 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I know it's late in the cycle so let's queue it for the next one before I forget it. I won't necessarily be queuing this. Not forgetting is a responsibility of individual developers.

Re: [PATCH 0/5] git p4: fix branch detection with --use-client-spec

2012-08-11 Thread Junio C Hamano
Pete Wyckoff p...@padd.com writes: matt...@korich.net wrote on Fri, 10 Aug 2012 12:14 -0700: Using git p4 on git version 1.7.12.rc2 has path issues. Standard clone/sync ops apparently place detected master and branches on independent and parallel directory structures instead of git branches.

Re: [PATCH v2] Let submodule command exit with error status if path does not exist

2012-08-11 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: I did not know that you prefer a space after the function name. I simply imitated the style from C and there we do not have spaces. It makes the style rules a bit more complicated. Wouldn't it be nicer to have the same as in C so we have less rules? I do