aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-28
| | | | | | | | | | | | | | | Remove the exceptions for "vim" and "defaults" in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Define the trivial fallback definition of shell functions in-line in git-mergetool-lib script, instead of dot-sourcing them from another file. The result is much easier to follow. [jc: squashed in an update from John Keeping as well] Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-27
| | | | | | | | | | | | | | | This will make it easier to use setup_tool in places where we expect that the selected tool will not support the current mode. We need to introduce a new return code for setup_tool to differentiate between the case of "the selected tool is invalid" and "the selected tool is not a built-in" since we must call setup_tool when a custom 'merge.<tool>.path' is configured for a built-in tool but avoid failing when the configured tool is not a built-in. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-27
| | | | | | | | | | | Check the can_diff and can_merge functions before deciding whether to add the tool to the available/unavailable lists. This makes "--tool-help" context-sensitive so that "git mergetool --tool-help" displays merge tools only and "git difftool --tool-help" displays diff tools only. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-27
| | | | | | | | vimdiff and vimdiff2 differ only by their merge command so remove the logic in the diff command since it's not actually needed. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-difftool: use git-mergetool--lib for "--tool-help"John Keeping2013-01-25
| | | | | | | | | | | | | | The "--tool-help" option to git-difftool currently displays incorrect output since it uses the names of the files in "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in git-mergetool--lib. Fix this by simply delegating the "--tool-help" argument to the show_tool_help function in git-mergetool--lib. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-25
| | | | | | | | | When using show_tool_help from git-difftool we will want it to print "git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool". Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-mergetool: remove redundant assignmentJohn Keeping2013-01-25
| | | | | | | | | | TOOL_MODE is set at the top of git-mergetool.sh so there is no need to set it again in show_tool_help. Removing this lets us re-use show_tool_help in git-difftool. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-25
| | | | | | | | | This is the first step in unifying "git difftool --tool-help" and "git mergetool --tool-help". Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.8.0v1.8.0Junio C Hamano2012-10-21
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.17.0 * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui: git-gui 0.17 git-gui: Don't prepend the prefix if value looks like a full path git-gui: Detect full path when parsing arguments git-gui: remove .git/CHERRY_PICK_HEAD after committing git-gui: Fix a loose/lose mistake git-gui: Fix semi-working shortcuts for unstage and revert git-gui: de.po: translate "remote" as "extern" git-gui: de.po: translate "bare" as "bloß" git-gui: de.po: consistently add untranslated hook names within braces git-gui: preserve commit messages in utf-8 git-gui: open console when using --trace on windows git-gui: fix a typo in po/ files git-gui: Use PWD if it exists on Mac OS X git-gui: fix git-gui crash due to uninitialized variable
| * git-gui 0.17gitgui-0.17.0Pat Thoyts2012-10-17
| | | | | | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: Don't prepend the prefix if value looks like a full pathAndrew Wong2012-10-17
| | | | | | | | | | | | | | | | | | When argument parsing fails to detect a file name, "git-gui" will try to use the previously detected "head" as the file name. We should avoid prepending the prefix if "head" looks like a full path. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: Detect full path when parsing argumentsAndrew Wong2012-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | When running "git-gui blame" from a subfolder (which means prefix is non-empty), if we pass a full path as argument, the argument parsing will fail to recognize the argument as a file name, because prefix is prepended to the argument. This patch handles that scenario by adding an additional branch that checks the file name without using the prefix. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: remove .git/CHERRY_PICK_HEAD after committingBeat Bolli2012-09-17
| | | | | | | | | | | | | | | | | | | | | | Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: Fix a loose/lose mistakeBeat Bolli2012-09-17
| | | | | | | | | | | | Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: Fix semi-working shortcuts for unstage and revertVitaly _Vi Shukela2012-09-17
| | | | | | | | | | | | | | | | | | | | | | | | Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding. They were working only when one area was focused (diff or commit message), now they should work everywhere. Acked-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * Merge branch 'rt/trans'Pat Thoyts2012-06-19
| |\
| | * git-gui: de.po: translate "remote" as "extern"Ralf Thielow2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | According to the translation in git-core, we translate "remote" as "extern". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| | * git-gui: de.po: translate "bare" as "bloß"Ralf Thielow2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | According to the translation in git-core, we translate "bare" as "bloß". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| | * git-gui: de.po: consistently add untranslated hook names within bracesRalf Thielow2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user might not really know what hook is actually meant if it's translated. To avoid such a confusion we should consistently write it untranslated within braces after. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * | git-gui: preserve commit messages in utf-8Pat Thoyts2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit message buffer is automatically preserved to a local file but this uses the system encoding which may fail to properly encode unicode text. Forcing this file to use utf-8 preserves the message correctly. Reported-by: Ángel José Riesgo <ajriesgo@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * | git-gui: open console when using --trace on windowsHeiko Voigt2012-03-25
| |/ | | | | | | | | | | | | | | | | | | When starting a gui program on windows stdout, stderr and stdin are not connected to the cmd console. As a workaround tk has a console window. Lets open this when the --trace commandline option has been given. This is helpful for debugging. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: fix a typo in po/ filesBenjamin Kerensa2012-03-10
| | | | | | | | | | | | | | | | | | | | "succeeded" was misspelled in the code, which propagated throughout the translations. Fixed all of them. Signed-off-by: Benjamin Kerensa <bkerensa <at> ubuntu.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: Use PWD if it exists on Mac OS XMarcus Karlsson2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current working directory is set to / when git-gui is invoked using the Git Gui.app bundle on Mac OS X. This means that if it is launched from a directory which contains a repository then git-gui won't automatically find it unless the repository happens to be located in /. The PWD environment variable is however preserved if the bundle is invoked using open(1). If git-gui would check for PWD then a user could for example type open -a 'Git Gui' on a command line in order to launch the program and it would automatically find the repository. Teach git-gui to use the PWD environment variable on Mac OS X. Signed-off-by: Marcus Karlsson <mk@acc.umu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: fix git-gui crash due to uninitialized variableClemens Buchacher2012-01-22
| | | | | | | | | | | | | | | | | | Recently, a clone initiated via git gui on Windows crashed on me due to an "unknown variable cdone". It turns out that there is a code path where this variable is used uninitialized. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano2012-10-17
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-10-17
|\ \ | | | | | | | | | | | | | | | * git://github.com/git-l10n/git-po: l10n: vi.po: update from v1.8.0-rc2-4-g42e55 l10n: Update Swedish translation (1964t0f0u)
| * \ Merge branch 'master' of https://github.com/nafmo/git-l10n-svJiang Xin2012-10-17
| |\ \ | | | | | | | | | | | | | | | | * 'master' of https://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (1964t0f0u)
| | * | l10n: Update Swedish translation (1964t0f0u)Peter Krefting2012-10-16
| | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * | | Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin2012-10-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update from v1.8.0-rc2-4-g42e55
| | * | | l10n: vi.po: update from v1.8.0-rc2-4-g42e55Tran Ngoc Quan2012-10-17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * translate 3 new messages * review quotes Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
* | | | Sync with 1.7.12.4Junio C Hamano2012-10-17
|\ \ \ \ | |/ / / |/| | |
| * | | Git 1.7.12.4v1.7.12.4Junio C Hamano2012-10-17
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'jk/maint-http-half-auth-push' into maintJunio C Hamano2012-10-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
| * \ \ \ Merge branch 'rr/git-uri-doc' into maintJunio C Hamano2012-10-17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
| * \ \ \ \ Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
| * \ \ \ \ \ Merge branch 'nd/doc-ignore' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
| * \ \ \ \ \ \ Merge branch 'jc/doc-long-options' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/maint-t1450-fsck-order-fix: t1450: the order the objects are checked is undefined
| * \ \ \ \ \ \ \ \ Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rr/test-use-shell-path-not-shell: test-lib: use $SHELL_PATH, not $SHELL
| * \ \ \ \ \ \ \ \ \ Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'po/maint-docs' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano2012-10-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
* | | | | | | | | | | | | | | Documentation/RelNotes: remove "updated up to this revision" markersThomas Ackermann2012-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were used to keep track of the last commit a release notes entry was written for, and should have been removed when cutting the final release. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | | | | Update draft release notes to 1.8.0Junio C Hamano2012-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano2012-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1) and master (v1.8.0-rc0). * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
| * | | | | | | | | | | | | http: fix segfault in handle_curl_resultJeff King2012-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create an http active_request_slot, we can set its "results" pointer back to local storage. The http code will fill in the details of how the request went, and we can access those details even after the slot has been cleaned up. Commit 8809703 (http: factor out http error code handling) switched us from accessing our local results struct directly to accessing it via the "results" pointer of the slot. That means we're accessing the slot after it has been marked as finished, defeating the whole purpose of keeping the results storage separate. Most of the time this doesn't matter, as finishing the slot does not actually clean up the pointer. However, when using curl's multi interface with the dumb-http revision walker, we might actually start a new request before handing control back to the original caller. In that case, we may reuse the slot, zeroing its results pointer, and leading the original caller to segfault while looking for its results inside the slot. Instead, we need to pass a pointer to our local results storage to the handle_curl_result function, rather than relying on the pointer in the slot struct. This matches what the original code did before the refactoring (which did not use a separate function, and therefore just accessed the results struct directly). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | | | l10n: Update git.pot (3 new, 6 removed messages)Jiang Xin2012-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | | | | | | | | | | | | | Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin2012-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update translation upto cc76011
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-09 20:20:53 +0000