Re: Want to do some cleanups in this round of l10n

2014-01-18 Thread Александър Шопов
How much of a translation (in Bulgarian) should I do to be included? I have no idea how much time do I have before 1.9 is out. For this round I will try to at least translate most used commands like: commit, push, pull, rebase I have sent translations of gitk and git gui to this list as inline pa

Re: Want to do some cleanups in this round of l10n

2014-01-18 Thread Jiang Xin
2014/1/18 Alexander Shopov (Александър Шопов) : > How much of a translation (in Bulgarian) should I do to be included? Feel free to send me pull request when you translated some (greater than zero) in the initial commit, and also update po/TEAMS in this commit. > I have no idea how much time do I

[PATCH] gitk: fix mistype

2014-01-18 Thread Max Kirillov
Signed-off-by: Max Kirillov --- gitk-git/gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index b217dbc..30a3b20 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -7958,7 +7958,7 @@ proc blobdiffmaybeseehere {ateof} { if {$diffseehere >=

Re: Workflow on git with 2 branch with specifc code

2014-01-18 Thread Gordon Freeman
Hello! Thx you all guys for the help. That's no need more explanations here for rebases Jon. I alredy do a lot of this when i need to change configs of databases and domains and other things, of my local branch to do some tests, so this is ok for me. Seems that i just need some. some people o

REQUEST-PULL: Please pull from git-gui.

2014-01-18 Thread Pat Thoyts
The following changes since commit 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce: git-gui 0.19 (2014-01-18 17:29:34 +) are available in the git repository at: http://repo.or.cz/r/git-gui.git tags/gitgui-0.19.0 for you to fetch changes up to 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce: git-gu

Re: git-p4: exception when cloning a perforce repository

2014-01-18 Thread Pete Wyckoff
dam...@iwi.me wrote on Thu, 16 Jan 2014 17:02 +0100: > > On 16 Jan 2014, at 15:45, Pete Wyckoff wrote: > > > Oh cool, that helps a lot. P4 is just broken here, so we can get > > away with being a bit sloppy in git. I'll try just pretending > > "empty symlinks" are not in the repo. Hopefully y

[PATCH v3 15/17] rename_tmp_log(): handle a possible mkdir/rmdir race

2014-01-18 Thread Michael Haggerty
If a directory vanishes while renaming the temporary reflog file, retry (up to 3 times). This could happen if another process deletes the directory created by safe_create_leading_directories() just before we rename the file into the directory. As far as I can tell, this race could not occur inter

[PATCH v3 11/17] lock_ref_sha1_basic(): if locking fails with ENOENT, retry

2014-01-18 Thread Michael Haggerty
If hold_lock_file_for_update() fails with errno==ENOENT, it might be because somebody else (for example, a pack-refs process) has just deleted one of the lockfile's ancestor directories. So if this condition is detected, try again (up to 3 times). Signed-off-by: Michael Haggerty --- refs.c | 13

[PATCH v3 01/17] safe_create_leading_directories(): fix format of "if" chaining

2014-01-18 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- sha1_file.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index e13bd2c..8031d51 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -125,8 +125,7 @@ int safe_create_leading_directories(char *path)

[PATCH v3 04/17] safe_create_leading_directories(): rename local variable

2014-01-18 Thread Michael Haggerty
Rename "pos" to "next_component", because now it always points at the next component of the path name that has to be processed. Signed-off-by: Michael Haggerty --- sha1_file.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 88b8d8c..

[PATCH v3 10/17] lock_ref_sha1_basic(): on SCLD_VANISHED, retry

2014-01-18 Thread Michael Haggerty
If safe_create_leading_directories() fails because a file along the path unexpectedly vanished, try again (up to 3 times). This can occur if another process is deleting directories at the same time as we are trying to make them. For example, "git pack-refs --all" tries to delete the loose refs an

[PATCH v3 07/17] safe_create_leading_directories(): introduce enum for return values

2014-01-18 Thread Michael Haggerty
Instead of returning magic integer values (which a couple of callers go to the trouble of distinguishing), return values from an enum. Add a docstring. Signed-off-by: Michael Haggerty --- builtin/init-db.c | 4 ++-- cache.h | 17 +++-- merge-recursive.c | 2 +- sha1_file

[PATCH v3 06/17] safe_create_leading_directories(): always restore slash at end of loop

2014-01-18 Thread Michael Haggerty
Always restore the slash that we scribbled over at the end of the loop, rather than also fixing it up at each premature exit from the loop. This makes it harder to forget to do the cleanup as new paths are added to the code. Signed-off-by: Michael Haggerty --- sha1_file.c | 22 +

[PATCH v3 02/17] safe_create_leading_directories(): reduce scope of local variable

2014-01-18 Thread Michael Haggerty
This makes it more obvious that values of "st" don't persist across loop iterations. Signed-off-by: Michael Haggerty --- sha1_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index 8031d51..d8647c7 100644 --- a/sha1_file.c +++ b/sha1_file.c @

[PATCH v3 14/17] rename_ref(): extract function rename_tmp_log()

2014-01-18 Thread Michael Haggerty
It's about to become a bit more complex. Signed-off-by: Michael Haggerty --- refs.c | 52 ++-- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/refs.c b/refs.c index 4060ed1..d0fab39 100644 --- a/refs.c +++ b/refs.c @@ -2528,6 +2528,

[PATCH v3 17/17] rename_tmp_log(): on SCLD_VANISHED, retry

2014-01-18 Thread Michael Haggerty
If safe_create_leading_directories() fails because a file along the path unexpectedly vanished, try again from the beginning. Try at most 4 times. Signed-off-by: Michael Haggerty --- refs.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 134d5aa

[PATCH v3 00/17] Fix some mkdir/rmdir races

2014-01-18 Thread Michael Haggerty
Sorry, I forgot to send this re-roll to the mailing list. This version differs only very slightly from v2: * Rebased to the current master (there were no conflicts). * Rename a couple of local variables from "attempts" to "attempts_remaining". * Patches 13, 16, and 17 have slightly improved c

[PATCH v3 03/17] safe_create_leading_directories(): add explicit "slash" pointer

2014-01-18 Thread Michael Haggerty
Keep track of the position of the slash character independently of "pos", thereby making the purpose of each variable clearer and working towards other upcoming changes. Signed-off-by: Michael Haggerty --- sha1_file.c | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) d

[PATCH v3 05/17] safe_create_leading_directories(): split on first of multiple slashes

2014-01-18 Thread Michael Haggerty
If the input path has multiple slashes between path components (e.g., "foo//bar"), then the old code was breaking the path at the last slash, not the first one. So in the above example, the second slash was overwritten with NUL, resulting in the parent directory being sought as "foo/". When stat(

[PATCH v3 13/17] remove_dir_recurse(): handle disappearing files and directories

2014-01-18 Thread Michael Haggerty
If a file or directory that we are trying to remove disappears (e.g., because another process has pruned it), do not consider it an error. However, if REMOVE_DIR_KEEP_TOPLEVEL is set, and the toplevel directory is missing, then consider it an error (like before). Signed-off-by: Michael Haggerty

[PATCH v3 08/17] cmd_init_db(): when creating directories, handle errors conservatively

2014-01-18 Thread Michael Haggerty
safe_create_leading_directories_const() returns a non-zero value on error. The old code at this calling site recognized a couple of particular error values, and treated all other return values as success. Instead, be more conservative: recognize the errors we are interested in, but treat any othe

[PATCH v3 12/17] remove_dir_recurse(): tighten condition for removing unreadable dir

2014-01-18 Thread Michael Haggerty
If opendir() fails on the top-level directory, it makes sense to try to delete it anyway--but only if the failure was due to EACCES. Signed-off-by: Michael Haggerty --- dir.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index d10a63f..785a83e 100644 --

[PATCH v3 16/17] rename_tmp_log(): limit the number of remote_empty_directories() attempts

2014-01-18 Thread Michael Haggerty
This doesn't seem to be a likely error, but we've got the counter anyway, so we might as well use it for an added bit of safety. Please note that the first call to rename() is optimistic, and it is normal for it to fail if there is a directory in the way. So bump the total number of allowed attem

[PATCH v3 09/17] safe_create_leading_directories(): add new error value SCLD_VANISHED

2014-01-18 Thread Michael Haggerty
Add a new possible error result that can be returned by safe_create_leading_directories() and safe_create_leading_directories_const(): SCLD_VANISHED. This value indicates that a file or directory on the path existed at one point (either it already existed or the function created it), but then it d

[PATCH v2] safe_create_leading_directories(): on Windows, \ can separate path components

2014-01-18 Thread Michael Haggerty
When cloning to a directory "C:\foo\bar" from Windows' cmd.exe where "foo" does not exist yet, Git would throw an error like fatal: could not create work tree dir 'c:\foo\bar'.: No such file or directory Fix this by not hard-coding a platform specific directory separator into safe_create_lea

Wonga Loan Right on your Doorstep.

2014-01-18 Thread loans
Do you need a Loan. Here is your opportunity to acquire one. Open attachment for further information. Open with Adobe Reader. Regards, Wonga Management. WONGA-LOANS.pdf Description: Adobe PDF document

Re: Verifiable git archives?

2014-01-18 Thread Michael Haggerty
On 01/09/2014 09:11 PM, Junio C Hamano wrote: > Andy Lutomirski writes: > >> It's possible, in principle, to shove enough metadata into the output >> of 'git archive' to allow anyone to verify (without cloning the repo) >> to verify that the archive is a correct copy of a given commit. Would >>

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-18 Thread Sebastian Schuberth
On Thu, Jan 2, 2014 at 10:19 PM, Johannes Schindelin wrote: >> and parsed to be stuffed into trees), it is fine to do so as long as all >> the codepaths understands the new world order, but my earlier "git grep" >> hits did not tell me that such a change is warranted. > > You call safe_create_lea

[PATCH] Documentation: @{-N} can refer to a commit

2014-01-18 Thread Thomas Rast
The @{-N} syntax always referred to the N-th last thing checked out, which can be either a branch or a commit (for detached HEAD cases). However, the documentation only mentioned branches. Edit in a "/commit" in the appropriate places. Reported-by: Kevin Signed-off-by: Thomas Rast --- This is

Re: [PATCH] Fix safe_create_leading_directories() for Windows

2014-01-18 Thread Sebastian Schuberth
On Thu, Jan 2, 2014 at 10:08 PM, Junio C Hamano wrote: >> Seems like the path to clone to is taken as-is from argv in >> cmd_clone(). So maybe another solution would be to replace all >> backslashes with forward slashes already there? > > That sounds like a workable alternative, and it might even