Revision d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb authored by Junio C Hamano on 05 January 2012, 00:23:12 UTC, committed by Junio C Hamano on 05 January 2012, 21:02:27 UTC
While identifying the commit merged to our history as "parent #2" is technically correct, we will never say "parent #1" (as that is the tip of our history before the merge is made), and we rarely would say "parent #3" (which would mean the merge is an octopus), especially when responding to a request to pull a signed tag. Treat the most common case to merge a single commit specially, and just say "merged tag '<tagname>'" instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 824958e
gettext.c
/*
* Copyright (c) 2010 Ævar Arnfjörð Bjarmason
*/
#include "git-compat-util.h"
#include "gettext.h"
int use_gettext_poison(void)
{
static int poison_requested = -1;
if (poison_requested == -1)
poison_requested = getenv("GIT_GETTEXT_POISON") ? 1 : 0;
return poison_requested;
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...