Skip to content

My patches

Felipe Contreras edited this page May 2, 2014 · 11 revisions

branch: improve verbose option

People have commented that this is a good change, yet it’s ignored.

Felipe Contreras (1):
      branch: reorganize verbose options

Reject non-ff pulls by default (v6)

The conclusion of the discussions is that this change is good, yet it doesn’t move forward.

Felipe Contreras (6):
      pull: rename pull.rebase to pull.mode
      pull: migrate all the tests to pull.mode
      pull: refactor $rebase variable into $mode
      pull: add --merge option
      pull: add merge-ff-only option
      pull: add warning on non-ff merges

build: add default aliases (v3)

All version control systems out there have default aliases, except Git. Mercurial even allows overriding the main commands, like 'hg commit' so all the arguments that use the override of default aliases causing discrepancies as a reason to reject this change are void, since clearly Mercurial doesn’t have such problems.

Felipe Contreras (1):
      build: add default aliases

Add core.mode configuration (v3)

Not even a reply.

Felipe Contreras (1):
      Add core.mode configuration

Officially start moving to the term 'staging area' (v2)

Everybody agrees this is the way to go, and yet Junio doesn’t comment on the way forward.

Felipe Contreras (14):
      Add proper 'stage' command
      stage: add edit command
      diff: document --staged
      grep: add --staged option
      rm: add --staged option
      stash: add --stage option to save
      stash: add --stage to pop and apply
      submodule: add --staged options
      apply: add --stage option
      apply: add --work, --no-work options
      completion: update --staged options
      reset: add --stage and --work options
      reset: allow --keep with --stage
      completion: update 'git reset' new stage options

transport-helper: refspec support

Seems like they will be picked up.

Felipe Contreras (8):
      fast-export: improve argument parsing
      fast-export: add new --refspec option
      transport-helper: add support for old:new refspec
      transport-helper: add support to push symbolic refs
      fast-import: add support to delete refs
      fast-export: add support to delete refs
      transport-helper: add support to delete branches
      transport-helper: remove unnecessary strbuf resets

Introduce publish tracking branch (v5)

Might actually happen.

Felipe Contreras (8):
      t5516 (fetch-push): fix test restoration
      Add concept of 'publish' branch
      branch: add --set-publish-to option
      push: add --set-publish option
      branch: display publish branch
      sha1_name: cleanup interpret_branch_name()
      sha1_name: simplify track finding
      sha1_name: add support for @{publish} marks

fetch: add new fetch.default configuration

No response whatsoever, even after a thorough expalanation of the issue. 'git fetch .' is still braindead.

Felipe Contreras (2):
      fetch: add new fetch.default configuration
      config: add fetch.default=simple to progress mode

Version fixes and cleanups (v4)

Our git.spec is clearly broken for release candidates, and yet the patch doesn’t receive feedback.

Felipe Contreras (2):
      version-gen: cleanup
      version-gen: fix versions

Massive improvents to rebase and cherry-pick (v6)

Both cherry-pick and rebase can use use a lot of improvements, and even though the errors are known, and the patches obviously correct, nothing happens.

Felipe Contreras (28):
      cherry-pick: don't barf when there's nothing to do
      cherry-pick: add --skip-empty option
      revert/cherry-pick: add --quiet option
      revert/cherry-pick: add --skip option
      builtin: add rewrite helper
      cherry-pick: store rewritten commits
      cherry-pick: don't store skipped commit
      builtin: move run_rewrite_hook() to rewrite.c
      builtin: rewrite: add copy_rewrite_notes()
      cherry-pick: add --action-name option
      cherry-pick: copy notes and run hooks
      cherry-pick: remember rerere-autoupdate
      rebase: split the cherry-pick stuff
      rebase: cherry-pick: fix mode storage
      rebase: cherry-pick: fix sequence continuation
      rebase: cherry-pick: fix abort of cherry mode
      rebase: cherry-pick: fix command invocations
      rebase: cherry-pick: fix status messages
      rebase: cherry-pick: automatically commit stage
      rebase: cherry-pick: set correct action-name
      rebase: trivial cleanup
      t: rebase-autostash: fix setup
      sequencer: store progress information
      prompt: parse cherry-pick rebase mode
      rebase: use 'cherrypick' mode instead of 'am'
      rebase: cherry-pick: add merge options
      rebase: remove merge mode
      rebase: cherry-pick: add copyright

Support for Ruby (v2)

Ruby is clearly the way to move forward to replace shell and perl scripts with C, with a similar syntax to all three, and yet this comprehensive patch series doesn’t even receive a response.

Felipe Contreras (43):
      Add support for ruby commands
      ruby: add support for internal ruby programs
      request-pull: fix annotated tag check
      request-pull: fix for specific branch
      request-pull: use appropriate ref
      request-pull: fix exact match checking
      request-pull: trivial simplification
      request-pull: t: trivial whitespace style fixes
      request-pull: t: add missing cat
      ruby: rewrite 'request-pull'
      ruby: request-pull: rewrite perl script
      ruby: request-pull: trivial simplifications
      ruby: bind setup_git_directory()
      ruby: bind dwim_ref()
      ruby: request-pull: use native dwim_ref()
      ruby: bind git_config()
      ruby: request-pull: use native git_config()
      ruby: bind read_ref()/peel_ref()
      ruby: bind get_sha1()
      ruby: request-pull: simplify tag fetching
      ruby: request-pull: use get_sha1()
      ruby: add Commit class
      ruby: bind get_merge_bases()
      ruby: request-pull: use get_merge_bases()
      ruby: request-pull: trivial cleanups
      ruby: bind remote and transport stuff
      ruby: request-pull: use native remote and transport
      ruby: bind find_unique_abbrev()
      ruby: request-pull: use native commit info
      ruby: bind read_sha1_file()
      ruby: request-pull: use read_sha1_file()
      shortlog: add missing declaration
      shortlog: split builtin from common code
      ruby: add RevInfo and DiffOptions
      ruby: bind shortlog()
      ruby: request-pull: use shortlog()
      ruby: bind diff_tree_sha1()
      ruby: bind log_tree_diff_flush()
      ruby: request-pull: use native diff_tree stuff
      ruby: request-pull: remove rescue block
      ruby: remove GIT_PAGER from environment
      ruby: add simpler option parser
      request-pull: rewrite to C

revision: add --except option (v3)

All comments were addressed, yet there doesn’t seem to be any path forward.

Felipe Contreras (1):
      revision: add --except option

sha1-name: refactor get_sha1() parsing

Duy Nguyen suggested that I do this, and now that I do the first step, the work gets ignored.

Felipe Contreras (1):
      sha1-name: refactor get_sha1() parsing
Clone this wiki locally