From 75940a001acb0c09abea8ac71ed1568ab125c795 Mon Sep 17 00:00:00 2001 From: Manlio Perillo Date: Thu, 13 Dec 2012 18:57:19 +0100 Subject: [PATCH 1/2] git.txt: add missing info about --git-dir command-line option Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo Signed-off-by: Junio C Hamano --- Documentation/git.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/git.txt b/Documentation/git.txt index e643683b3a..60db2929b5 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -650,6 +650,7 @@ git so take care if using Cogito etc. If the 'GIT_DIR' environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. + The '--git-dir' command-line option also sets this value. 'GIT_WORK_TREE':: Set the path to the working tree. The value will not be From bdd478d620034dc6517aea940f5dc6b88f780c04 Mon Sep 17 00:00:00 2001 From: Matthew Daley Date: Fri, 14 Dec 2012 02:36:30 +1300 Subject: [PATCH 2/2] Fix sizeof usage in get_permutations Currently it gets the size of an otherwise unrelated, unused variable instead of the expected struct size. Signed-off-by: Matthew Daley Signed-off-by: Junio C Hamano --- builtin/pack-redundant.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index f5c6afc5dd..649c3aaa93 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -301,14 +301,14 @@ static void pll_free(struct pll *l) */ static struct pll * get_permutations(struct pack_list *list, int n) { - struct pll *subset, *ret = NULL, *new_pll = NULL, *pll; + struct pll *subset, *ret = NULL, *new_pll = NULL; if (list == NULL || pack_list_size(list) < n || n == 0) return NULL; if (n == 1) { while (list) { - new_pll = xmalloc(sizeof(pll)); + new_pll = xmalloc(sizeof(*new_pll)); new_pll->pl = NULL; pack_list_insert(&new_pll->pl, list); new_pll->next = ret; @@ -321,7 +321,7 @@ static struct pll * get_permutations(struct pack_list *list, int n) while (list->next) { subset = get_permutations(list->next, n - 1); while (subset) { - new_pll = xmalloc(sizeof(pll)); + new_pll = xmalloc(sizeof(*new_pll)); new_pll->pl = subset->pl; pack_list_insert(&new_pll->pl, list); new_pll->next = ret;