| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Reported-by: From: Marco Hinz <mh.codebro@gmail.com>
|
| |
|
|
|
|
|
|
|
| |
git-am also uses .git/rebase-apply for patch list but
the file original-commit does not exist (as no commit exist).
This patch handles both git rebase and git am. Also:
- get the first line (rather than the first char) when the message
contains only one line;
- remove unused function (ironically that should have been used here).
|
| |
|
|
| |
Reported-by: Marco Hinz <mh.codebro@gmail.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
This will detect changes to submodules from the superproject's
perspective, e.g. after `git rm submodule`.
>From GIT-DIFF-INDEX(1)/GIT-DIFF(1):
Using "dirty" ignores all changes to the work tree of submodules,
only changes to the commits stored in the superproject are shown
(this was the behavior until 1.7.0).
|
| |
|
|
|
|
|
|
| |
Since a rebase contains a list of patches to re-apply, re-use the
facility for stgit to have the same mechanism.
The patch list given to the gen-{un,}applied-string hooks is an array
with the sha1 and the subject of the commit. On rebase merge, the
applied patches prior to current contains only a number and "?".
|
| |
|
|
|
| |
This would fix handling get-revision, check-for-changes or
check-for-staged-changes when set per repository.
|
| |
|
|
|
| |
Documentation and hg backend use applied-string. patch-string does not
appear anywhere.
|
| |
|
|
|
|
| |
Since VCS_INFO_bydir_detect always uses the
vcs_comm[detect_need_file], it should be cleared when querying
it without file.
|
| |
|
|
|
| |
When revert or cherry-pick involve many commits the .git/sequencer
directory holds context for the action and no CHERRY_PICK_HEAD exist.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
Also a couple of read-from-minibuffer fixes: don't pass numeric
argument to recursive edit, and hide the minibuffer edit from
the undo history.
|
| |
|
|
|
|
| |
In empty repositories, HEAD is an unresolvable symbolic ref. Start computing
stagedstr/unstagedstr in that case; for the former, use a different method
than the non-empty-repository case.
|
| |
|
|
|
|
|
| |
The previous code would fail to detect the wcroot with Subversion 1.7+
when cwd is at least two levels below the root (i.e., ../../.svn exists
and ../.svn doesn't), and would then pass to the hook the revision and
basename of cwd rather than of the wcroot.
|
| |
|
|
|
|
|
| |
Previously, the value of the wc root would be used. In Subversion,
it makes more sense to use the revision of cwd, since all commands
(e.g., 'svn ci', 'svnversion') operate only on cwd and below, not on
wcroot and below.
|
| |
|
|
|
|
|
| |
This makes %b expand to a refname rather than a sha1 when HEAD is detached but
happens to match some ref (branch, tag, etc). The resulting output will
typically contain a slash (e.g., "tags/v1.0.2", "heads/mybranch"), which helps
distinguish it from the output in the "HEAD is a symbolic ref" case.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
accessed via a symlink
31985 Clemens Hammacher and 32064 Hong Xu
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Allows alien file systems to be marked as not having executable fiels
|
| |
|
|
| |
Makes handlers put into the background run without job control.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Given `alias fetch='noglob fetch'`, without this change `run-help fetch`
recurses to invoke itself on the noglob command, bringing up the help
for noglob. Similarly for nocorrect. Thus the user would have to quit
out of the pager, then avoid quitting out of the loop, so that they can
go into the second iteration and see the help for the second instance
found by `whence -a`, which happens to be the target of the alias.
With common pagers, that's thus 'q', 'not-q'. Somewhat frustrating.
Without this change, `alias foo='noglob bar'` where `foo` is not
otherwise a command would _never_ show the help for `bar`, since it only
showed the help for `noglob` and there was no second line of whence
output to trigger the second pass.
With this change, aliases to `noglob|nocorrect` of a command somewhat
ignore the presence of that precommand modifier; if a command is aliased
to `noglob $itself`, then the result is that the first line of whence
output is shown, no pager is used, the user can immediately see a prompt
to continue and press something other-than-q to see the help for the
command.
If given `alias foo='noglob bar'` then `run-help foo` will immediately
show the help for bar.
This behaviour was chosen to be consistent with the existing alias
support, but just working better with the precommand modifier.
|
| |
|
|
|
| |
-p splits words of commands passed to it.
-P is like -p for when the program doesn't understand the -- convention
|
| |
|
|
|
|
|
|
|
|
| |
Guilt uses the same internal directory for keeping state as stgit, but
it doesn't use the same files (not surprisingly). This caused error
messages due to missing files.
This fixes that by making the "stgit-active?" test stricter.
Reported-by: Axel Beckert <abe@debian.org>
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
warn_create_global
This is a followup to 30995 taking Peter's suggestions from 30997 into
account.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
git backend
|
