author | Junio C Hamano <gitster@pobox.com> | |
Mon, 2 Apr 2012 16:19:47 +0000 (09:19 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 2 Apr 2012 16:19:47 +0000 (09:19 -0700) |
Portuguese Portuguese translations from Marco Sousa via Jiang Xin
* 'master' of git://github.com/git-l10n/git-po:
l10n: Add the Dutch translation team and initialize nl.po
l10n: Inital Portuguese Portugal language (pt_PT)
l10n: Improve zh_CN translation for Git 1.7.10-rc3
* 'master' of git://github.com/git-l10n/git-po:
l10n: Add the Dutch translation team and initialize nl.po
l10n: Inital Portuguese Portugal language (pt_PT)
l10n: Improve zh_CN translation for Git 1.7.10-rc3
Documentation/technical/api-string-list.txt | patch | blob | history | |
builtin/config.c | patch | blob | history |
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
index ce24eb96f5efdee579f8600323731368fee4048b..5a0c14fcebfcf4d5cbad4900d062703412c501e1 100644 (file)
Insert a new element to the string_list. The returned pointer can be
handy if you want to write something to the `util` pointer of the
- string_list_item containing the just added string.
+ string_list_item containing the just added string. If the given
+ string already exists the insertion will be skipped and the
+ pointer to the existing item returned.
+
Since this function uses xrealloc() (which die()s if it fails) if the
list needs to grow, it is safe not to check the pointer. I.e. you may
diff --git a/builtin/config.c b/builtin/config.c
index d41a9bfb143c2bd82e539c3f390f17914c2e853a..33c8820af6fc73453b749ec6026077f76180e26c 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
xstrdup(prefix_filename(prefix,
strlen(prefix),
given_config_file));
- else
- given_config_file = given_config_file;
}
if (respect_includes == -1)