delta/git.git, branch fr/add-interactive-argv-array github.com: git/git.git add: use struct argv_array in run_add_interactive() 2014-03-18T19:47:29+00:00 Fabian Ruch bafain@gmail.com 2014-03-15T11:14:40+00:00 c45a18e88f47fc9b23f8e8e7b14a030434917a66 run_add_interactive() in builtin/add.c manually computes array bounds and allocates a static args array to build the add--interactive command line, which is error-prone. Use the argv-array helper functions instead. Signed-off-by: Fabian Ruch <bafain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
run_add_interactive() in builtin/add.c manually computes array bounds
and allocates a static args array to build the add--interactive command
line, which is error-prone. Use the argv-array helper functions instead.

Signed-off-by: Fabian Ruch <bafain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
i18n: proposed command missing leading dash 2014-03-05T14:10:24+00:00 Sandy Carter sandy.carter@savoirfairelinux.com 2014-03-03T14:55:53+00:00 16216b6ab1073b7aaa8225c32208758e6ea16629 Add missing leading dash to proposed commands in french output when using the command: git branch --set-upstream remotename/branchname and when upstream is gone Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Add missing leading dash to proposed commands in french output when
using the command:
    git branch --set-upstream remotename/branchname
and when upstream is gone

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
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
Merge branch 'jk/allow-fetch-onelevel-refname' into maint 2014-02-13T21:38:34+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:38:34+00:00 c337684842e37d2422aa75b04ca1a3ee6d4a8ef0 "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs 
"git clone" would fail to clone from a repository that has a ref
directly under "refs/", e.g. "refs/stash", because different
validation paths do different things on such a refname.  Loosen the
client side's validation to allow such a ref.

* jk/allow-fetch-onelevel-refname:
  fetch-pack: do not filter out one-level refs
Merge branch 'jk/interpret-branch-name-fix' into maint 2014-02-13T21:38:25+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:38:25+00:00 21261fabdde83514ddac0bbba96fdeb83a5c2363 A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling 
A handful of bugs around interpreting $branch@{upstream} notation
and its lookalike, when $branch part has interesting characters,
e.g. "@", and ":", have been fixed.

* jk/interpret-branch-name-fix:
  interpret_branch_name: find all possible @-marks
  interpret_branch_name: avoid @{upstream} past colon
  interpret_branch_name: always respect "namelen" parameter
  interpret_branch_name: rename "cp" variable to "at"
  interpret_branch_name: factor out upstream handling