how to recovery corrupted git blob

2013-12-26 Thread Yvonne Leroy
Hi all, I have a corrupted git repo.I've worked through the process https://git.wiki.kernel.org/index.php/GitFaq#How_to_fix_a_broken_repository.3F but still have some problem. 1- at the beginning, with git fsck --full, it showed: Checking object directories: 100% (256/256), done. dangling

Re: how to recovery corrupted git blob

2013-12-26 Thread Christian Couder
Hi, On Thu, Dec 26, 2013 at 9:35 AM, Yvonne Leroy articulati...@gmail.com wrote: 1- at the beginning, with git fsck --full, it showed: [...] missing blob e187557d07857b974ea51e3ea962ac120cfc9488 [...] commit e415bb6d51ee05d60055d89f2bf63ccb32f4c12c Author: Yvonne Leroy

Re: questions / suggestions about history simplification

2013-12-26 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: OTOH, including a sample repository embedded within the git repository is either impossible or very ugly (e.g. having a non-default value of GIT_DIR for the embedded repository). But I doubt you were suggesting that ;-) No. By the way,

Restore Lost Data for iPhone, iPad iPod Touch

2013-12-26 Thread StellaWolf
Restore Lost Data for iPhone, iPad iPod Touch -- View this message in context: http://git.661346.n2.nabble.com/Restore-Lost-Data-for-iPhone-iPad-iPod-Touch-tp7601224.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line unsubscribe git in

[PATCH] git-svn: workaround for a bug in svn serf backend

2013-12-26 Thread Roman Kagan
Subversion serf backend in versions 1.8.5 and below has a bug that the function creating the descriptor of a file change -- add_file() -- doesn't make a copy of its 3d argument when storing it on the returned descriptor. As a result, by the time this field is used (in transactions of file copying

Restore Lost Data for iPhone, iPad iPod Touch

2013-12-26 Thread StellaWolf
Restore Lost Data for iPhone, iPad iPod Touch -- View this message in context: http://git.661346.n2.nabble.com/Restore-Lost-Data-for-iPhone-iPad-iPod-Touch-tp7601226.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line unsubscribe git in

Publish Your PDF as Flipbook with Flipbook Maker

2013-12-26 Thread StellaWolf
Publish Your PDF as Flipbook with Flipbook Maker -- View this message in context: http://git.661346.n2.nabble.com/Publish-Your-PDF-as-Flipbook-with-Flipbook-Maker-tp7601227.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line unsubscribe

Crash on context menu

2013-12-26 Thread George Bateman
Win7 SP1; Git identifies itself as version 1.8.4-preview20130916. I copied the Git Bash shortcut from the start menu to the root of a Git repository (no remote part). I use the advanced context menu. For other files in the directory, it works fine, but hovering over the Git GUI option of the Bash

Re: Crash on context menu

2013-12-26 Thread Erik Faye-Lund
On Thu, Dec 26, 2013 at 2:16 PM, George Bateman georgebatema...@gmail.com wrote: Win7 SP1; Git identifies itself as version 1.8.4-preview20130916. I copied the Git Bash shortcut from the start menu to the root of a Git repository (no remote part). I use the advanced context menu. For other

[WIP/PATCH 0/5] git checkout --recurse-submodules

2013-12-26 Thread Jonathan Nieder
Hi, This patch series comes from https://github.com/jlehmann/git-submod-enhancements branch recursive_submodule_checkout. It needed some tiny tweaks to apply to current master and build without warnings, but nothing major, and I haven't sanity checked it much beyond that and letting the kind

[PATCH 2/5] submodule: teach unpack_trees() to remove submodule contents

2013-12-26 Thread Jonathan Nieder
From: Jens Lehmann jens.lehm...@web.de Date: Tue, 19 Jun 2012 20:55:45 +0200 Implement the functionality needed to enable work tree manipulating commands to that a deleted submodule should not only affect the index (leaving all the files of the submodule in the work tree) but also to remove the

[PATCH 3/5] submodule: teach unpack_trees() to repopulate submodules

2013-12-26 Thread Jonathan Nieder
From: Jens Lehmann jens.lehm...@web.de Date: Mon, 18 Jun 2012 22:11:45 +0200 Signed-off-by: Jens Lehmann jens.lehm...@web.de Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Neat. Would probably be clearer with some of the corresponding tests squashed in to illustrate the intended behavior.

[PATCH 4/5] submodule: teach unpack_trees() to update submodules

2013-12-26 Thread Jonathan Nieder
From: Jens Lehmann jens.lehm...@web.de Date: Fri, 5 Apr 2013 18:35:27 +0200 Signed-off-by: Jens Lehmann jens.lehm...@web.de Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Also neat, also would benefit from documentation or tests. entry.c| 15 -- submodule.c| 86

[PATCH 5/5] Teach checkout to recursively checkout submodules

2013-12-26 Thread Jonathan Nieder
From: Jens Lehmann jens.lehm...@web.de Date: Wed, 13 Jun 2012 18:50:10 +0200 Signed-off-by: Jens Lehmann jens.lehm...@web.de Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- This is the patch that actually introduces the --recurse-submodules option, which makes the rest work. The tests

Re: german translation bug

2013-12-26 Thread Ralf Thielow
On Wed, Dec 25, 2013 at 10:53 PM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: Am Mittwoch, 25. Dezember 2013, 21:59:10 schrieb Ralf Thielow: What version of Git do you use? What distro in what version do you use? freshly installed kubuntu 13.10. The package language-pack-de mentioned at

Re: [PATCH v2 00/21] Support multiple worktrees

2013-12-26 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sun, Dec 22, 2013 at 1:38 PM, Junio C Hamano gits...@pobox.com wrote: Do we even need to expose them as ref-like things as a part of the external API/UI in the first place? For end-user scripts that want to operate in a real or borrowing worktree,

Re: [PATCH] add: don't complain when adding empty project root

2013-12-26 Thread Jonathan Nieder
Hi, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Thanks. [...] --- a/builtin/add.c +++ b/builtin/add.c @@ -544,7 +544,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) for (i = 0; i pathspec.nr; i++) {

Re: [PATCH] add: don't complain when adding empty project root

2013-12-26 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: How about something like the following, for squashing in? With or without the tweaks below, Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks, both. Regarding git add --refresh (no other arguments), it would say Nothing specified, nothing

Re: [PATCH v3 07/10] builtin/replace: teach listing using short, medium or full formats

2013-12-26 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: On Thu, Dec 19, 2013 at 7:58 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: I think this last one might be useful for people replacing objects with objects that have another type. ... which

Re: [PATCH] add: don't complain when adding empty project root

2013-12-26 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Regarding git add --refresh (no other arguments), it would say Nothing specified, nothing added., and that is unrelated to the breakage reported and fixed in this thread, I think. It is the same message git add (no other arguments) gives, which I

Re: [PATCH 02/12] Convert starts_with() to skip_prefix() for option parsing

2013-12-26 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sat, Dec 21, 2013 at 4:31 AM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: /* here we care if we saw the prefix, as above */ if (parse_prefix(foo, prefix, the_rest)) ... /* * and here we do not care, and

Re: [PATCH 1/2] sha1_object_info_extended: provide delta base sha1s

2013-12-26 Thread Junio C Hamano
Jeff King p...@peff.net writes: @@ -1824,6 +1856,22 @@ static int packed_object_info(struct packed_git *p, off_t obj_offset, } } + if (oi-delta_base_sha1) { + if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) { + const unsigned

Re: [WIP/PATCH 0/5] git checkout --recurse-submodules

2013-12-26 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Hi, This patch series comes from https://github.com/jlehmann/git-submod-enhancements branch recursive_submodule_checkout. It needed some tiny tweaks to apply to current master and build without warnings, but nothing major, and I haven't sanity

Re: [PATCH 0/2] cat-file --batch-check='%(deltabase)'

2013-12-26 Thread Jonathan Nieder
Jeff King wrote: I needed this recently to write tests for another (not yet published) series. But I think it stands on its own as a debugging / introspection tool. [1/2]: sha1_object_info_extended: provide delta base sha1s [2/2]: cat-file: provide %(deltabase) batch format Neat. The

Re: [PATCH] git-svn: workaround for a bug in svn serf backend

2013-12-26 Thread Jonathan Nieder
Roman Kagan wrote: Subversion serf backend in versions 1.8.5 and below has a bug that the function creating the descriptor of a file change -- add_file() -- doesn't make a copy of its 3d argument when storing it on the returned 3d makes me think of 3-dimensional. ;-) I think you mean third

What's cooking in git.git (Dec 2013, #05; Thu, 26)

2013-12-26 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'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH 1/5] safe_create_leading_directories(): modernize format of if chaining

2013-12-26 Thread Jonathan Nieder
Michael Haggerty wrote: [Subject: safe_create_leading_directories(): modernize format of if chaining] Trivia: it's not so much modernizing as following KR style, which git more or less followed since day 1. Linux's Documentation/CodingStyle explains: Note that the closing brace is empty

Re: [PATCH 2/5] safe_create_leading_directories(): reduce scope of local variable

2013-12-26 Thread Jonathan Nieder
Michael Haggerty wrote: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- sha1_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index c9245a6..cc9957e 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -108,9 +108,10 @@ int

Re: [PATCH 3/5] safe_create_leading_directories(): add slash pointer

2013-12-26 Thread Jonathan Nieder
Michael Haggerty wrote: [Subject: safe_create_leading_directories(): add slash pointer] Is this a cleanup or improving the (internal) functionality of the function somehow? The above one-liner doesn't sum up for me in an obvious way why this is a good change. Keep track of the position of

Re: [PATCH 4/5] safe_create_leading_directories(): fix a mkdir/rmdir race

2013-12-26 Thread Jonathan Nieder
Hi, Michael Haggerty wrote: It could be that some other process is trying to clean up empty directories at the same time that safe_create_leading_directories() is attempting to create them. In this case, it could happen that directory a/b was present at the end of one iteration of the loop

Re: [PATCH 5/5] rename_ref(): fix a mkdir()/rmdir() race

2013-12-26 Thread Jonathan Nieder
Michael Haggerty wrote: refs.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) A test or example reproduction recipe would be nice. (But I can understand not having one --- races are hard to test.) [...] --- a/refs.c +++ b/refs.c [...] @@ -2574,6 +2575,13 @@ int

Re: german translation bug

2013-12-26 Thread Jiang Xin
2013/12/27 Ralf Thielow ralf.thie...@gmail.com: On Wed, Dec 25, 2013 at 10:53 PM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: Am Mittwoch, 25. Dezember 2013, 21:59:10 schrieb Ralf Thielow: What version of Git do you use? What distro in what version do you use? freshly installed kubuntu

Re: [PATCH] git-svn: workaround for a bug in svn serf backend

2013-12-26 Thread Roman Kagan
2013/12/27 Jonathan Nieder jrnie...@gmail.com: Roman Kagan wrote: Subversion serf backend in versions 1.8.5 and below has a bug that the function creating the descriptor of a file change -- add_file() -- doesn't make a copy of its 3d argument when storing it on the returned 3d makes me

Re: [PATCH] git-svn: workaround for a bug in svn serf backend

2013-12-26 Thread Roman Kagan
2013/12/27 Roman Kagan rka...@mail.ru: 2013/12/27 Jonathan Nieder jrnie...@gmail.com: Could this be reproduced with a test script to make sure we don't reintroduce the bug again later? (It's okay if the test only fails on machines with the problematic svn version.) That would need a fairly