Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'jk/send-email-sender-prompt' General clean-ups in various areas, originally written to support a patch that later turned out to be unneeded. * jk/send-email-sender-prompt: t9001: check send-email behavior with implicit sender t: add tests for "git var" ident: keep separate "explicit" flags for author and committer ident: make user_ident_explicitly_given static t7502: factor out autoident prerequisite test-lib: al…
Junio C Hamano
Merge branch 'fc/send-email-no-sender-prompt' * fc/send-email-no-sender-prompt: send-email: avoid questions when user has an ident
Junio C Hamano
Merge branch 'er/doc-add-new-commands' * er/doc-add-new-commands: Documentation: how to add a new command
Junio C Hamano
Merge branch 'jl/submodule-rm' Finishing touches to "git rm $submodule" that removes the working tree of a submodule. * jl/submodule-rm: Teach rm to remove submodules when given with a trailing '/'
Junio C Hamano
Merge branch 'pp/gitweb-config-underscore' The key "gitweb.remote_heads" is not legal git config; this maps it to "gitweb.remoteheads". * pp/gitweb-config-underscore: gitweb: make remote_heads config setting work
Junio C Hamano
Merge branch 'fc/completion-test-simplification' Clean up completion tests. Use of conslidated helper may make instrumenting one particular test during debugging of the test itself, but I think that issue should be addressed in some other way (e.g. making sure individual tests in 9902 can be skipped). * fc/completion-test-simplification: completion: simplify __gitcomp() test helper completion: refactor __gitcomp related tests completion:…
Junio C Hamano
Merge branch 'maint' * maint: git-fast-import.txt: improve documentation for quoted paths git-remote-mediawiki: escape ", \, and LF in file names
Matthieu Moy
git-fast-import.txt: improve documentation for quoted paths The documentation mentioned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sentence, not part of the actual string). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by…
Matthieu Moy
git-remote-mediawiki: escape ", \, and LF in file names A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'master' of git://github.com/git-l10n/git-po Further l10n updates. * 'master' of git://github.com/git-l10n/git-po: l10n: vi.po: Update follow git-v1.8.0-273-g2d242
Junio C Hamano
t4049: refocus tests The primary thing Linus's patch wanted to change was to make sure that 0-line change appears for a mode-only change. Update the first test to chmod a file that we can see in the output (limited by --stat-count) to demonstrate it. Also make sure to use test_chmod and compare the index and the tree, so that we can run this test even on a filesystem without permission bits. Later two tests are abo…
Felipe Contreras
completion: fix warning for zsh Otherwise the user might get something like: git-completion.sh:2466: command not found: compdef If this script is loaded before compinit. The script would work either way, but let's not be more annoying to the user. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
Merge git://github.com/vnwildman/git * git://github.com/vnwildman/git: l10n: vi.po: Update follow git-v1.8.0-273-g2d242
Junio C Hamano
Merge branch 'master' of git://github.com/git-l10n/git-po Update the localization string up to 2d242fb (Update draft release notes for 1.8.1, 2012-11-21) * 'master' of git://github.com/git-l10n/git-po: l10n: Update Swedish translation (1975t0f0u) l10n: vi.po: update to git-v1.7.12-437-g1084f l10n: Update git.pot (14 new, 3 removed messages)
Junio C Hamano
Merge branch 'maint'
Junio C Hamano
Update draft release notes to 1.8.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'fc/zsh-completion' * fc/zsh-completion: completion: start moving to the new zsh completion completion: add new zsh completion
Junio C Hamano
Merge branch 'mm/status-push-pull-advise' * mm/status-push-pull-advise: status: add advice on how to push/pull to tracking branch
Junio C Hamano
Merge branch 'jk/pickaxe-textconv' Use textconv filters when searching with "log -S". * jk/pickaxe-textconv: pickaxe: use textconv for -S counting pickaxe: hoist empty needle check
Junio C Hamano
Start preparing for 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
t9001: check send-email behavior with implicit sender We allow send-email to use an implicitly-defined identity for the sender (because there is still a confirmation step), but we abort when we cannot generate such an identity. Let's make sure that we test this. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rh/maint-gitweb-highlight-ext' into maint Syntax highlighting in "gitweb" was not quite working. * rh/maint-gitweb-highlight-ext: gitweb.perl: fix %highlight_ext mappings
Junio C Hamano
Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint "git p4" used to try expanding malformed "$keyword$" that spans across multiple lines. * pw/maint-p4-rcs-expansion-newline: git p4: RCS expansion should not span newlines
Ralf Thielow
completion: add options --single-branch and --branch to "git clone" Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt * fc/send-email-no-sender-prompt: send-email: avoid questions when user has an ident
Jeff King
t: add tests for "git var" We do not currently have any explicit tests for "git var" at all (though we do exercise it to some degree as a part of other tests). Let's add a few basic sanity checks. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation/git-push.txt: clarify the "push from satellite" workflow The context of the example to push into refs/remotes/satellite/ hierarchy of the other repository needs to be spelled out explicitly for the value of this example to be fully appreciated. Make it so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras
remote-hg: fix for older versions of python As Amit Bakshi reported, older versions of python (< 2.7) don't have subprocess.check_output, so let's use subprocess.Popen directly as suggested. Suggested-by: Amit Bakshi <ambakshi@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras
remote-hg: fix for files with spaces Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
diff --shortstat: do not count "unmerged" entries Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next