You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
572 lines
22 KiB
572 lines
22 KiB
To: git@vger.kernel.org |
|
Bcc: lwn@lwn.net |
|
Subject: What's cooking in git.git (Jul 2014, #06; Tue, 29) |
|
X-master-at: 583b61c1af1bac12d6b48b2583ad508b5ab9964c |
|
X-next-at: fbdcabe3ee4652186b0b2370eb0646ec0abf433e |
|
|
|
What's cooking in git.git (Jul 2014, #06; Tue, 29) |
|
-------------------------------------------------- |
|
|
|
Here are the topics that have been cooking. Commits prefixed with |
|
'-' are only in 'pu' (proposed updates) while commits prefixed with |
|
'+' are in 'next'. |
|
|
|
You can find the changes described here in the integration branches |
|
of the repositories listed at |
|
|
|
http://git-blame.blogspot.com/p/git-public-repositories.html |
|
|
|
-------------------------------------------------- |
|
[Graduated to "master"] |
|
|
|
* cc/replace-graft (2014-07-21) 9 commits |
|
(merged to 'next' on 2014-07-22 at 9b14090) |
|
+ replace: add test for --graft with a mergetag |
|
+ replace: check mergetags when using --graft |
|
+ replace: add test for --graft with signed commit |
|
+ replace: remove signature when using --graft |
|
+ contrib: add convert-grafts-to-replace-refs.sh |
|
+ Documentation: replace: add --graft option |
|
+ replace: add test for --graft |
|
+ replace: add --graft option |
|
+ replace: cleanup redirection style in tests |
|
|
|
"git replace" learned a "--graft" option to rewrite parents of a |
|
commit. |
|
|
|
|
|
* jk/misc-fixes-maint (2014-07-24) 5 commits |
|
(merged to 'next' on 2014-07-27 at 321a77c) |
|
+ apply: avoid possible bogus pointer |
|
+ fix memory leak parsing core.commentchar |
|
+ transport: fix leaks in refs_from_alternate_cb |
|
+ free ref string returned by dwim_ref |
|
+ receive-pack: don't copy "dir" parameter |
|
|
|
Miscellaneous fixes. |
|
|
|
|
|
* jk/rebase-am-fork-point (2014-07-16) 2 commits |
|
(merged to 'next' on 2014-07-22 at 7648293) |
|
+ rebase: omit patch-identical commits with --fork-point |
|
+ rebase--am: use --cherry-pick instead of --ignore-if-in-upstream |
|
|
|
"git rebase --fork-point" did not filter out patch-identical |
|
commits correctly. |
|
|
|
|
|
* jk/stable-prio-queue (2014-07-15) 4 commits |
|
(merged to 'next' on 2014-07-22 at 46e9bc3) |
|
+ t5539: update a flaky test |
|
+ paint_down_to_common: use prio_queue |
|
+ prio-queue: make output stable with respect to insertion |
|
+ prio-queue: factor out compare and swap operations |
|
|
|
-------------------------------------------------- |
|
[New Topics] |
|
|
|
* ep/avoid-test-a-o (2014-07-25) 1 commit |
|
(merged to 'next' on 2014-07-27 at 45de31d) |
|
+ t9814: fix misconversion from test $a -o $b to test $a || test $b |
|
|
|
Will merge to 'master'. |
|
|
|
|
|
* mm/config-edit-global (2014-07-25) 3 commits |
|
- commit: advertise config --global --edit on guessed identity |
|
- home_config_paths(): let the caller ignore xdg path |
|
- config --global --edit: create a template file if needed |
|
|
|
Will merge to 'next'. |
|
|
|
|
|
* rs/init-no-duplicate-real-path (2014-07-28) 1 commit |
|
- init: avoid superfluous real_path() calls |
|
|
|
Will merge to 'next'. |
|
|
|
-------------------------------------------------- |
|
[Stalled] |
|
|
|
* jk/tag-contains (2014-06-30) 8 commits |
|
. perf: add tests for tag --contains |
|
. tag: use commit_contains |
|
. commit: provide a fast multi-tip contains function |
|
. string-list: add pos to iterator callback |
|
. add functions for memory-efficient bitmaps |
|
. paint_down_to_common: use prio_queue |
|
. tag: factor out decision to stream tags |
|
. tag: allow --sort with -n |
|
|
|
Expecting a reroll. |
|
|
|
|
|
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits |
|
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks |
|
- git-add--interactive: Preserve diff heading when splitting hunks |
|
|
|
Waiting for a reroll. |
|
|
|
|
|
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit |
|
- gitweb: Harden UTF-8 handling in generated links |
|
|
|
$gmane/250758? |
|
|
|
|
|
* rh/prompt-tests (2014-06-05) 11 commits |
|
- t9904: new __git_ps1 tests for Zsh |
|
- test-lib: make it possible to override how test code is eval'd |
|
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1 |
|
- lib-prompt-tests.sh: put all tests inside a function |
|
- t9903: move prompt tests to a new lib-prompt-tests.sh file |
|
- t9903: move PS1 color code variable definitions to lib-bash.sh |
|
- t9903: include "Bash" in test names via new $shellname var |
|
- t9903: run pc mode tests again with PS1 expansion disabled |
|
- t9903: move test name prefix to a separate variable |
|
- t9903: put the Bash pc mode prompt test cases in a function |
|
- t9903: remove Zsh test from the suite of Bash prompt tests |
|
|
|
Expecting a reroll to limit the damage to test_eval_; also reported |
|
to be broken with older zsh that are still in the field ($gmane/251231). |
|
|
|
|
|
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits |
|
- userdiff: support Java try keyword |
|
- userdiff: support C# async methods and correct C# keywords |
|
|
|
Reviews sent; waiting for a response. |
|
|
|
|
|
* cc/interpret-trailers (2014-05-28) 11 commits |
|
- Documentation: add documentation for 'git interpret-trailers' |
|
- trailer: add tests for commands in config file |
|
- trailer: execute command from 'trailer.<name>.command' |
|
- trailer: add tests for "git interpret-trailers" |
|
- trailer: add interpret-trailers command |
|
- trailer: put all the processing together and print |
|
- trailer: parse trailers from file or stdin |
|
- trailer: process command line trailer arguments |
|
- trailer: read and process config information |
|
- trailer: process trailers from input message and arguments |
|
- trailer: add data structures and basic functions |
|
|
|
A new filter to programatically edit the tail end of the commit log |
|
messages. |
|
|
|
What is the status of this one? I think I saw reviews by Michael |
|
but after that I do not recall seeing any updates. |
|
|
|
|
|
* mh/lockfile (2014-04-15) 25 commits |
|
. trim_last_path_elm(): replace last_path_elm() |
|
. resolve_symlink(): take a strbuf parameter |
|
. resolve_symlink(): use a strbuf for internal scratch space |
|
. change lock_file::filename into a strbuf |
|
. commit_lock_file(): use a strbuf to manage temporary space |
|
. try_merge_strategy(): use a statically-allocated lock_file object |
|
. try_merge_strategy(): remove redundant lock_file allocation |
|
. struct lock_file: declare some fields volatile |
|
. lockfile: avoid transitory invalid states |
|
. commit_lock_file(): die() if called for unlocked lockfile object |
|
. commit_lock_file(): inline temporary variable |
|
. remove_lock_file(): call rollback_lock_file() |
|
. lock_file(): exit early if lockfile cannot be opened |
|
. write_packed_entry_fn(): convert cb_data into a (const int *) |
|
. prepare_index(): declare return value to be (const char *) |
|
. delete_ref_loose(): don't muck around in the lock_file's filename |
|
. cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN |
|
. lockfile.c: document the various states of lock_file objects |
|
. lock_file(): always add lock_file object to lock_file_list |
|
. hold_lock_file_for_append(): release lock on errors |
|
. lockfile: unlock file if lockfile permissions cannot be adjusted |
|
. rollback_lock_file(): set fd to -1 |
|
. rollback_lock_file(): do not clear filename redundantly |
|
. api-lockfile: expand the documentation |
|
. unable_to_lock_die(): rename function from unable_to_lock_index_die() |
|
|
|
Ejected from 'pu' to unclutter. |
|
Expecting a reroll. |
|
|
|
|
|
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit |
|
- git-rebase: print name of rev when using shorthand |
|
|
|
Teach "git rebase -" to report the concrete name of the branch |
|
(i.e. the previous one). |
|
|
|
But it stops short and does not do the same for "git rebase @{-1}". |
|
Expecting a reroll. |
|
|
|
|
|
* tr/merge-recursive-index-only (2014-02-05) 3 commits |
|
- merge-recursive: -Xindex-only to leave worktree unchanged |
|
- merge-recursive: internal flag to avoid touching the worktree |
|
- merge-recursive: remove dead conditional in update_stages() |
|
(this branch is used by tr/remerge-diff.) |
|
|
|
|
|
* tr/remerge-diff (2014-02-26) 5 commits |
|
. log --remerge-diff: show what the conflict resolution changed |
|
. name-hash: allow dir hashing even when !ignore_case |
|
. merge-recursive: allow storing conflict hunks in index |
|
. revision: fold all merge diff variants into an enum merge_diff_mode |
|
. combine-diff: do not pass revs->dense_combined_merges redundantly |
|
(this branch uses tr/merge-recursive-index-only.) |
|
|
|
"log -p" output learns a new way to let users inspect a merge |
|
commit by showing the differences between the automerged result |
|
with conflicts the person who recorded the merge would have seen |
|
and the final conflict resolution that was recorded in the merge. |
|
|
|
Needs to be rebased, now kb/fast-hashmap topic is in. |
|
|
|
|
|
* jk/makefile (2014-02-05) 16 commits |
|
. FIXUP |
|
. move LESS/LV pager environment to Makefile |
|
. Makefile: teach scripts to include make variables |
|
. FIXUP |
|
. Makefile: auto-build C strings from make variables |
|
. Makefile: drop *_SQ variables |
|
. FIXUP |
|
. Makefile: add c-quote helper function |
|
. Makefile: introduce sq function for shell-quoting |
|
. Makefile: always create files via make-var |
|
. Makefile: store GIT-* sentinel files in MAKE/ |
|
. Makefile: prefer printf to echo for GIT-* |
|
. Makefile: use tempfile/mv strategy for GIT-* |
|
. Makefile: introduce make-var helper function |
|
. Makefile: fix git-instaweb dependency on gitweb |
|
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS |
|
|
|
Simplify the Makefile rules and macros that exist primarily for |
|
quoting purposes, and make it easier to robustly express the |
|
dependency rules. |
|
|
|
Expecting a reroll. |
|
|
|
|
|
* po/everyday-doc (2014-01-27) 1 commit |
|
- Make 'git help everyday' work |
|
|
|
This may make the said command to emit something, but the source is |
|
not meant to be formatted into a manual pages to begin with, and |
|
also its contents are a bit stale. It may be a good first step in |
|
the right direction, but needs more work to at least get the |
|
mark-up right before public consumption. |
|
|
|
Will hold. |
|
|
|
|
|
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits |
|
- merge: drop unused arg from abort_commit method signature |
|
- merge: make prepare_to_commit responsible for write_merge_state |
|
- t7505: ensure cleanup after hook blocks merge |
|
- t7505: add missing && |
|
|
|
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that |
|
run during "git merge". The log message stresses too much on one |
|
hook, prepare-commit-msg, but it would equally apply to other hooks |
|
like post-merge, I think. |
|
|
|
Waiting for a reroll. |
|
|
|
|
|
* jc/graph-post-root-gap (2013-12-30) 3 commits |
|
- WIP: document what we want at the end |
|
- graph: remove unused code a bit |
|
- graph: stuff the current commit into graph->columns[] |
|
|
|
This was primarily a RFH ($gmane/239580). |
|
|
|
|
|
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits |
|
- perf-lib: add test_perf_cleanup target |
|
- perf-lib: split starting the test from the execution |
|
|
|
Add test_perf_cleanup shell function to the perf suite, that allows |
|
the script writers to define a test with a clean-up action. |
|
|
|
Will hold. |
|
|
|
|
|
* jc/show-branch (2014-03-24) 5 commits |
|
- show-branch: use commit slab to represent bitflags of arbitrary width |
|
- show-branch.c: remove "all_mask" |
|
- show-branch.c: abstract out "flags" operation |
|
- show-branch.c: lift all_mask/all_revs to a global static |
|
- show-branch.c: update comment style |
|
|
|
Waiting for the final step to lift the hard-limit before sending it out. |
|
|
|
-------------------------------------------------- |
|
[Cooking] |
|
|
|
* nd/multiple-work-trees-1 (2014-07-29) 8 commits |
|
- checkout --to: do not touch existing target directory |
|
- checkout: prefix --to argument properly when cwd is moved |
|
- environment.c: fix incorrect git_graft_file initialization |
|
- checkout --to: fix dangling pointers in remove_junk() |
|
- checkout: no auto-detach if the ref is already checked out |
|
- prune --repos: fix uninitialized access |
|
- checkout: no need to call check_linked_checkouts if head_ref is NULL |
|
- gitrepository-layout.txt: s/ignored/ignored if/ |
|
(this branch uses nd/multiple-work-trees.) |
|
|
|
Continue polishing nd/multiple-work-trees topic in 'next'. |
|
|
|
|
|
* rs/ref-transaction-reflog (2014-07-23) 15 commits |
|
- refs.c: allow deleting refs with a broken sha1 |
|
- refs.c: remove lock_any_ref_for_update |
|
- refs.c: make unlock_ref/close_ref/commit_ref static |
|
- refs.c: rename log_ref_setup to create_reflog |
|
- reflog.c: use a reflog transaction when writing during expire |
|
- refs.c: allow multiple reflog updates during a single transaction |
|
- refs.c: only write reflog update if msg is non-NULL |
|
- refs.c: add a flag to allow reflog updates to truncate the log |
|
- refs.c: add a transaction function to append a reflog entry |
|
- lockfile.c: make hold_lock_file_for_append preserve meaningful errno |
|
- refs.c: add a function to append a reflog entry to a fd |
|
- refs.c: add a new update_type field to ref_update |
|
- refs.c: rename the transaction functions |
|
- refs.c: make ref_transaction_delete a wrapper for ref_transaction_update |
|
- refs.c: make ref_transaction_create a wrapper to ref_transaction_update |
|
(this branch is used by rs/ref-transaction-multi and rs/ref-transaction-rename; uses rs/ref-transaction and rs/ref-transaction-1.) |
|
|
|
Cover updates to reflog with the same transaction mechanism as used |
|
for reflog manipulations. |
|
|
|
|
|
* nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit |
|
- abspath.c: use PATH_MAX in real_path_internal() |
|
|
|
Will drop; rs/strbuf-getcwd topic covers this codepath. |
|
|
|
|
|
* sk/mingw-uni-fix-more (2014-07-21) 14 commits |
|
(merged to 'next' on 2014-07-28 at 0945196) |
|
+ Win32: enable color output in Windows cmd.exe |
|
+ Win32: patch Windows environment on startup |
|
+ Win32: keep the environment sorted |
|
+ Win32: use low-level memory allocation during initialization |
|
+ Win32: reduce environment array reallocations |
|
+ Win32: don't copy the environment twice when spawning child processes |
|
+ Win32: factor out environment block creation |
|
+ Win32: unify environment function names |
|
+ Win32: unify environment case-sensitivity |
|
+ Win32: fix environment memory leaks |
|
+ Win32: Unicode environment (incoming) |
|
+ Win32: Unicode environment (outgoing) |
|
+ Revert "Windows: teach getenv to do a case-sensitive search" |
|
+ tests: do not pass iso8859-1 encoded parameter |
|
|
|
Most of these are battle-tested in msysgit and are needed to |
|
complete what has been merged to 'master' already. |
|
|
|
Will merge to 'master'. |
|
|
|
|
|
* sk/mingw-tests-workaround (2014-07-21) 6 commits |
|
(merged to 'next' on 2014-07-28 at 2f3b7ac) |
|
+ t800[12]: work around MSys limitation |
|
+ t9902: mingw-specific fix for gitfile link files |
|
+ t4210: skip command-line encoding tests on mingw |
|
+ MinGW: disable legacy encoding tests |
|
+ t0110/MinGW: skip tests that pass arbitrary bytes on the command line |
|
+ MinGW: Skip test redirecting to fd 4 |
|
(this branch is used by jc/not-mingw-cygwin.) |
|
|
|
Make tests pass on msysgit by mostly disabling ones that are |
|
infeasible on that platform. |
|
|
|
Will merge to 'master'. |
|
|
|
|
|
* cb/mergetool-difftool (2014-07-21) 2 commits |
|
- difftool: don't assume that default sh is sane |
|
- mergetool: don't require a work tree for --tool-help |
|
|
|
|
|
* rs/strbuf-getcwd (2014-07-29) 10 commits |
|
- use strbuf_add_absolute_path() to add absolute paths |
|
- abspath: convert absolute_path() to strbuf |
|
- use xgetcwd() to set $GIT_DIR |
|
- use xgetcwd() to get the current directory or die |
|
- wrapper: add xgetcwd() |
|
- abspath: convert real_path_internal() to strbuf |
|
- abspath: use strbuf_getcwd() to remember original working directory |
|
- setup: convert setup_git_directory_gently_1 et al. to strbuf |
|
- unix-sockets: use strbuf_getcwd() |
|
- strbuf: add strbuf_getcwd() |
|
|
|
Will merge to 'next'. |
|
|
|
|
|
* jc/not-mingw-cygwin (2014-07-21) 2 commits |
|
- test prerequisites: enumerate with commas |
|
- test prerequisites: eradicate NOT_FOO |
|
(this branch uses sk/mingw-tests-workaround.) |
|
|
|
We have been using NOT_{MINGW,CYGWIN} test prerequisites long |
|
before Peff invented support for negated prerequisites e.g. !MINGW |
|
and we still add more uses of the former. Convert them to the |
|
latter to avoid confusion. |
|
|
|
|
|
* jk/more-push-completion (2014-07-22) 3 commits |
|
(merged to 'next' on 2014-07-28 at d1d4c27) |
|
+ completion: complete `git push --force-with-lease=` |
|
+ completion: add some missing options to `git push` |
|
+ completion: complete "unstuck" `git push --recurse-submodules` |
|
|
|
Will merge to 'master'. |
|
|
|
|
|
* ta/config-set (2014-07-29) 2 commits |
|
- test-config: add tests for the config_set API |
|
- add `config_set` API for caching config-like files |
|
|
|
More or less solidified enough to be built other enhancements upon. |
|
Will merge to 'next'. |
|
|
|
|
|
* rs/ref-transaction-1 (2014-07-16) 20 commits |
|
- refs.c: make delete_ref use a transaction |
|
- refs.c: make prune_ref use a transaction to delete the ref |
|
- refs.c: remove lock_ref_sha1 |
|
- refs.c: remove the update_ref_write function |
|
- refs.c: remove the update_ref_lock function |
|
- refs.c: make lock_ref_sha1 static |
|
- walker.c: use ref transaction for ref updates |
|
- fast-import.c: use a ref transaction when dumping tags |
|
- receive-pack.c: use a reference transaction for updating the refs |
|
- refs.c: change update_ref to use a transaction |
|
- branch.c: use ref transaction for all ref updates |
|
- fast-import.c: change update_branch to use ref transactions |
|
- sequencer.c: use ref transactions for all ref updates |
|
- commit.c: use ref transactions for updates |
|
- replace.c: use the ref transaction functions for updates |
|
- tag.c: use ref transactions when doing updates |
|
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR |
|
- refs.c: make ref_transaction_begin take an err argument |
|
- refs.c: update ref_transaction_delete to check for error and return status |
|
- refs.c: change ref_transaction_create to do error checking and return status |
|
(this branch is used by rs/ref-transaction, rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename.) |
|
|
|
The second batch of the transactional ref update series. |
|
|
|
|
|
* jc/reopen-lock-file (2014-07-14) 1 commit |
|
(merged to 'next' on 2014-07-21 at 8277dc9) |
|
+ lockfile: allow reopening a closed but still locked file |
|
|
|
Needed in the "commit -p" code path to update the cache tree in the |
|
index. |
|
|
|
|
|
* nd/multiple-work-trees (2014-07-17) 31 commits |
|
(merged to 'next' on 2014-07-17 at a29d310) |
|
+ checkout: don't require a work tree when checking out into a new one |
|
+ git_path(): keep "info/sparse-checkout" per work-tree |
|
+ count-objects: report unused files in $GIT_DIR/repos/... |
|
+ gc: support prune --repos |
|
+ gc: factor out gc.pruneexpire parsing code |
|
+ gc: style change -- no SP before closing parenthesis |
|
+ prune: strategies for linked checkouts |
|
+ checkout: detach if the branch is already checked out elsewhere |
|
+ checkout: clean up half-prepared directories in --to mode |
|
+ checkout: support checking out into a new working directory |
|
+ use new wrapper write_file() for simple file writing |
|
+ wrapper.c: wrapper to open a file, fprintf then close |
|
+ setup.c: support multi-checkout repo setup |
|
+ setup.c: detect $GIT_COMMON_DIR check_repository_format_gently() |
|
+ setup.c: convert check_repository_format_gently to use strbuf |
|
+ setup.c: detect $GIT_COMMON_DIR in is_git_directory() |
|
+ setup.c: convert is_git_directory() to use strbuf |
|
+ git-stash: avoid hardcoding $GIT_DIR/logs/.... |
|
+ *.sh: avoid hardcoding $GIT_DIR/hooks/... |
|
+ git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects |
|
+ $GIT_COMMON_DIR: a new environment variable |
|
+ commit: use SEQ_DIR instead of hardcoding "sequencer" |
|
+ fast-import: use git_path() for accessing .git dir instead of get_git_dir() |
|
+ reflog: avoid constructing .lock path with git_path |
|
+ *.sh: respect $GIT_INDEX_FILE |
|
+ git_path(): be aware of file relocation in $GIT_DIR |
|
+ path.c: group git_path(), git_pathdup() and strbuf_git_path() together |
|
+ path.c: rename vsnpath() to do_git_path() |
|
+ git_snpath(): retire and replace with strbuf_git_path() |
|
+ path.c: make get_pathname() call sites return const char * |
|
+ path.c: make get_pathname() return strbuf instead of static buffer |
|
(this branch is used by nd/multiple-work-trees-1.) |
|
|
|
A replacement for contrib/workdir/git-new-workdir that does not |
|
rely on symbolic links and make sharing of objects and refs safer |
|
by making the borrowee and borrowers aware of each other. |
|
|
|
Will cook in 'next'. |
|
|
|
|
|
* dt/cache-tree-repair (2014-07-14) 4 commits |
|
(merged to 'next' on 2014-07-21 at e83db34) |
|
+ cache-tree: Write updated cache-tree after commit |
|
+ cache-tree: subdirectory tests |
|
+ test-dump-cache-tree: invalid trees are not errors |
|
+ cache-tree: create/update cache-tree on checkout |
|
|
|
Add a few more places in "commit" and "checkout" that make sure |
|
that the cache-tree is fully populated in the index. |
|
|
|
Will cook in 'next'. |
|
|
|
|
|
* hv/submodule-config (2014-06-30) 4 commits |
|
(merged to 'next' on 2014-07-17 at 5e0ce45) |
|
+ do not die on error of parsing fetchrecursesubmodules option |
|
+ use new config API for worktree configurations of submodules |
|
+ extract functions for submodule config set and lookup |
|
+ implement submodule config cache for lookup of submodule names |
|
|
|
Will cook in 'next'. |
|
|
|
|
|
* rs/ref-transaction (2014-07-17) 12 commits |
|
- refs.c: fix handling of badly named refs |
|
- refs.c: make write_ref_sha1 static |
|
- fetch.c: change s_update_ref to use a ref transaction |
|
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers |
|
- refs.c: pass a skip list to name_conflict_fn |
|
- refs.c: call lock_ref_sha1_basic directly from commit |
|
- refs.c: move the check for valid refname to lock_ref_sha1_basic |
|
- refs.c: pass NULL as *flags to read_ref_full |
|
- refs.c: pass the ref log message to _create/delete/update instead of _commit |
|
- refs.c: add an err argument to delete_ref_loose |
|
- wrapper.c: add a new function unlink_or_msg |
|
- wrapper.c: simplify warn_if_unremovable |
|
(this branch is used by rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename; uses rs/ref-transaction-1.) |
|
|
|
|
|
* jc/test-lazy-prereq (2014-06-13) 1 commit |
|
- tests: drop GIT_*_TIMING_TESTS environment variable support |
|
|
|
Test-script clean-up. |
|
|
|
Will hold. |
|
|
|
|
|
* mt/patch-id-stable (2014-06-10) 1 commit |
|
- patch-id: change default to stable |
|
|
|
Teaches "git patch-id" to compute the patch ID that does not change |
|
when the files in a single patch is reordered. As this new algorithm |
|
is backward incompatible, the last bit to flip it to be the default |
|
is left out of 'master' for now. |
|
|
|
Will hold. |
|
|
|
-------------------------------------------------- |
|
[Discarded] |
|
|
|
* jh/submodule-tests (2014-04-17) 1 commit |
|
. t7410: 210 tests for various 'git submodule update' scenarios
|
|
|