[PATCH v3 8/9] t5521: test --dry-run does not make any changes

2015-05-13 Thread Paul Tan
Test that when --dry-run is provided to git-pull, it does not make any changes, namely: * --dry-run gets passed to git-fetch, so no FETCH_HEAD will be created and no refs will be fetched. * The index and work tree will not be modified. Signed-off-by: Paul Tan pyoka...@gmail.com ---

[PATCH v3 0/9] Improve git-pull test coverage

2015-05-13 Thread Paul Tan
This is a re-roll of [1]. This series depends on jc/merge. This patch series improves test coverage of git-pull.sh, and is part of my GSoC project to rewrite git-pull into a builtin. Improving test coverage helps to prevent regressions that could occur due to the rewrite. This re-roll includes

Re: cmd_struct

2015-05-13 Thread Junio C Hamano
On Wed, May 13, 2015 at 4:10 PM, Thiago Farina tfrans...@gmail.com wrote: Would be too churn/noise (at this point) to rename cmd_struct to builtin_cmd? The name has served us well, I do not see a compelling reason to change it to anything else, and I suspect the name stayed unchanged because

Re: HEAD - branch decoration doesn't work with --decorate=full

2015-05-13 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The new-style HEAD - branch style decoration doesn't work when --decorate=full is used: $ bin-wrappers/git show --oneline --decorate c518059 (HEAD - master, gitster/master) Merge branch 'maint' $ bin-wrappers/git show --oneline --decorate=full

[PATCH 2/3] sha1_name: get_sha1_with_context learns to follow symlinks

2015-05-13 Thread David Turner
Wire up get_sha1_with_context to call get_tree_entry_follow_symlinks when GET_SHA1_FOLLOW_SYMLINKS is passed in flags. G_S_FOLLOW_SYMLINKS is incompatible with G_S_ONLY_TO_DIE because the diagnosis that ONLY_TO_DIE triggers does not at present consider symlinks, and it would be a significant

Re: [PATCH 0/8] asciidoc fixups

2015-05-13 Thread Jeff King
On Wed, May 13, 2015 at 09:43:54AM +0200, Johannes Schindelin wrote: I would like to believe that I am included in said group, because we recently switched to use AsciiDoctor in Git for Windows 2.x. In msysGit times, we could not even run AsciiDoc (and neither AsciiDoctor), instead we relied

Re: Git: How to keep multiple bare repos in sync?

2015-05-13 Thread chenxitwo
not remote sync. We have three teams to participate in the same project, and is located in different places. Bandwidth that between the two of our teams is not enough. Three teams have their own git server. Like this kind of situation, how should handle? chenxitwo From: Junio C Hamano

[PATCHv2 1/2] git-p4: add failing test for P4EDITOR handling

2015-05-13 Thread Luke Diamand
Add test case that git-p4 handles a setting of P4EDITOR that takes arguments, e.g. gvim -f Signed-off-by: Luke Diamand l...@diamand.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t9820-git-p4-editor-handling.sh | 38 ++ 1 file changed, 38

[PATCHv2 2/2] git-p4: fix handling of multi-word P4EDITOR

2015-05-13 Thread Luke Diamand
This teaches git-p4 to pass the P4EDITOR variable to the shell for expansion, so that any command-line arguments are correctly handled. Without this, git-p4 can only launch the editor if P4EDITOR is solely the path to the binary, without any arguments. This also fixes t9805, which relied on the