Re: [PATCH] merge, pull: stop advising 'commit -a' in case of conflict

Junio C Hamano gits...@pobox.com writes: Here is how I phrased in the one queued tentatively. OK with me, thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

[PATCH] read_index_from(): catch out of order entries when reading an index file

Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com --- read-cache.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/read-cache.c b/read-cache.c index 5d3c8bd..023d6d7 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1465,6 +1465,21 @@ static struct cache_entry

[GIT PULL] l10n updates for Git 2.1.1

Hi Junio, Please pull the following l10n updates to the maint branch. The following changes since commit 869951babc24fef5c5cd58f86baefc25b6ed3765: l10n: de.po: improve message when switching branches (2014-08-23 19:17:38 +0200) are available in the git repository at:

Re: [PATCH 1/2] t9300: test filedelete root

On 29 авг. 2014 г., at 2:30, Junio C Hamano gits...@pobox.com wrote: You may have been concentrating on the delete root case, but as long as you claim We add a series to test filedelete command, it would be sensible to test more typical cases of deleting files, not the entire tree as well,

Re: [PATCH 2/2] fast-import: fix segfault in store_tree()

On 29 авг. 2014 г., at 3:16, Junio C Hamano gits...@pobox.com wrote: Missing ‘;' Thanks, I’ll fix it. What a stupid mistype, I was writing some amount of Go code recently and it doesn’t use semicolons. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[PATCH v2 1/2] t9300: test filedelete command

Add new fast-import test series for filedelete command. Signed-off-by: Maxim Bublis sat...@yandex-team.ru --- t/t9300-fast-import.sh | 104 + 1 file changed, 104 insertions(+) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index

[PATCH v2 2/2] fast-import: fix segfault in store_tree()

Branch tree is NULLified by filedelete command if we are trying to delete root tree. Add sanity check and use load_tree() in that case. Signed-off-by: Maxim Bublis sat...@yandex-team.ru --- fast-import.c | 6 +- t/t9300-fast-import.sh | 4 ++-- 2 files changed, 7 insertions(+), 3

[PATCH v2 0/2] fast-import: fix segfault and filedelete tests

Removing root tree with filedelete command would lead to segmentation fault in store_tree(). First patch from patch series adds filedelete command tests with test case to show incorrect behaviour on filedelete root operation. Second one fixes bug by sanity check and load_tree() usage. Maxim

Re: [PATCH 4/9] autoconf: Check for timer_t

For the record, this commit doesn't contain my errata for OS X: ifeq ($(uname_S),Darwin) ... HAVE_DEV_TTY = YesPlease + NO_TIMER_T = UnfortunatelyYes COMPAT_OBJS += compat/precompose_utf8.o ... endif -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: git fsck exit code?

On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote: It looks like git fsck exits with 0 status even if there are some errors. The only case where there's a non-zero exit code is if verify_pack reports errors -- but not e.g. fsck_object_dir. It will also bail non-zero with _certain_

Re: [PATCH 2/2] index-pack: handle duplicate base objects gracefully

On Fri, Aug 29, 2014 at 3:08 PM, Jeff King p...@peff.net wrote: On Fri, Aug 29, 2014 at 02:56:18PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: If a pack contains duplicates of an object, and if that object has any deltas pointing at it with REF_DELTA, we will try to