delta/git.git, branch iu/fix-parse-options-h-comment github.com: git/git.git parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval 2015-03-30T02:56:12+00:00 Ivan Ukhov ivan.ukhov@gmail.com 2015-03-29T08:32:55+00:00 d3c0811467153d3bf1732fef94530e5b0e7cdddf When 20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30) removed OPT_SET_PTR, the comment in the header that describes what the option did to defval field was left behind by mistake. Remove it. Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
When 20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30)
removed OPT_SET_PTR, the comment in the header that describes what
the option did to defval field was left behind by mistake.  Remove
it.

Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
parse-options: remove unused OPT_SET_PTR 2014-03-31T20:01:19+00:00 Marat Radchenko marat@slonopotamus.org 2014-03-30T11:08:23+00:00 20d1c6528c76242581e89c271679d35884d916dc OPT_SET_PTR was never used since its creation at db7244bd (parse-options new features., 2007-11-07). Signed-off-by: Junio C Hamano <gitster@pobox.com> 
OPT_SET_PTR was never used since its creation at db7244bd
(parse-options new features., 2007-11-07).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
parse-options: add cast to correct pointer type to OPT_SET_PTR 2014-03-31T18:55:41+00:00 Junio C Hamano gitster@pobox.com 2014-03-30T02:01:54+00:00 9ff8ff310b71ab79ffb0ecaa004dec65cec31a45 Do not force users of OPT_SET_PTR to cast pointer to correct underlying pointer type by integrating cast into OPT_SET_PTR macro. Cast is required to prevent 'initialization makes integer from pointer without a cast' compiler warning. Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Do not force users of OPT_SET_PTR to cast pointer to correct
underlying pointer type by integrating cast into OPT_SET_PTR macro.

Cast is required to prevent 'initialization makes integer from pointer
without a cast' compiler warning.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
MSVC: fix t0040-parse-options crash 2014-03-31T18:54:27+00:00 Marat Radchenko marat@slonopotamus.org 2014-03-30T11:08:21+00:00 e25c070cb5c85ac3abe787373563a31c8893a669 On 64-bit MSVC, pointers are 64 bit but `long` is only 32. Thus, casting string to `unsigned long`, which is redundand on other platforms, throws away important bits and when later cast to `intptr_t` results in corrupt pointer. This patch fixes test-parse-options by replacing harming cast with correct one. Signed-off-by: Marat Radchenko <marat@slonopotamus.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
On 64-bit MSVC, pointers are 64 bit but `long` is only 32.
Thus, casting string to `unsigned long`, which is redundand on other
platforms, throws away important bits and when later cast to `intptr_t`
results in corrupt pointer.

This patch fixes test-parse-options by replacing harming cast with
correct one.

Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.9.0 2014-02-14T19:35:04+00:00 Junio C Hamano gitster@pobox.com 2014-02-14T19:35:04+00:00 5f95c9f850b19b368c43ae399cc831b17a26a5ac Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
release notes: typo fixes 2014-02-14T19:22:56+00:00 Michael J Gruber git@drmicha.warpmail.net 2014-02-13T10:35:08+00:00 9c8ce7397bac108f83d77dfd96786edb28937511 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 1.8.5.5 2014-02-13T21:42:26+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:42:26+00:00 475c52b7ac59bb5d2f955bd68c069622d9575d50 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.8.5.5 2014-02-13T21:41:53+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:40:47+00:00 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'bm/merge-base-octopus-dedup' into maint 2014-02-13T21:38:59+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:38:59+00:00 2cd861672e1021012f40597b9b68cc3a9af62e10 "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper 
"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper
Merge branch 'jc/revision-range-unpeel' into maint 2014-02-13T21:38:47+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:38:47+00:00 5032098614b6f68258d1f5d13615b9dcbf25f040 "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * jc/revision-range-unpeel: revision: propagate flag bits from tags to pointees revision: mark contents of an uninteresting tree uninteresting 
"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix.  This is a regression in 1.8.4.x series.

* jc/revision-range-unpeel:
  revision: propagate flag bits from tags to pointees
  revision: mark contents of an uninteresting tree uninteresting