- 02 5月, 2006 3 次提交
-
-
由 Junio C Hamano 提交于
* jc/pathcheck: revision parsing: make "rev -- paths" checks stronger.
-
由 Junio C Hamano 提交于
* nh/fetch-http: git-fetch: resolve remote symrefs for HTTP transport
-
由 Junio C Hamano 提交于
* se/rebase: Add --continue and --abort options to git-rebase.
-
- 30 4月, 2006 2 次提交
-
-
由 Junio C Hamano 提交于
* fix: git-format-patch: Use rfc2822 compliant date.
-
由 Huw Davies 提交于
Signed-off-by: NHuw Davies <huw@codeweavers.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 29 4月, 2006 7 次提交
-
-
由 Junio C Hamano 提交于
* fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
-
由 Sean Estabrooks 提交于
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Sean Estabrooks 提交于
and fix up asciidoc "callouts" Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
-
由 Matthias Kestenholz 提交于
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
-
由 Matthias Kestenholz 提交于
Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
-
- 28 4月, 2006 6 次提交
-
-
由 Junio C Hamano 提交于
After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: verify-pack: check integrity in a saner order.
-
由 Junio C Hamano 提交于
Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* pb/config: git-cvsserver: typofixes Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
-
由 Junio C Hamano 提交于
* jc/diffstat: diff --stat: show complete rewrites consistently.
-
由 Linus Torvalds 提交于
When I split out the builtin commands into their own files, I left the include of <sys/ioctl.h> in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 27 4月, 2006 9 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Nick Hengeveld 提交于
git-fetch validates that a remote ref resolves to a SHA1 prior to calling git-http-fetch. This adds support for resolving a few levels of symrefs to get to the SHA1. Signed-off-by: NNick Hengeveld <nickh@reactrix.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 sean 提交于
git rebase [--onto <newbase>] <upstream> [<branch>] git rebase --continue git rebase --abort Add "--continue" to restart the rebase process after manually resolving conflicts. The user is warned if there are still differences between the index and the working files. Add "--abort" to restore the original branch, and remove the .dotest working files. Some minor additions to the git-rebase documentation. [jc: fix that applies to the maintenance track has been dealt with separately.] Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
If you don't have a "--" marker, then: - all of the arguments we are going to assume are pathspecs must exist in the working tree. - none of the arguments we parsed as revisions could be interpreted as a filename. so that there really isn't any possibility of confusion in case somebody does have a revision that looks like a pathname too. The former rule has been in effect; this implements the latter. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
-
由 Junio C Hamano 提交于
There is no point reading the whole object just to make sure it exists and it is of the expected type. We added sha1_object_info() for such need after this code was written, so use it. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Linus Torvalds 提交于
When we are in a subdirectory of a git archive, we need to take the prefix of that subdirectory into accoung when we verify filename arguments. Noted by Matthias Lederhofer This also uses the improved error reporting for all the other git commands that use the revision parsing interfaces, not just git-rev-parse. Also, it makes the error reporting for mixed filenames and argument flags clearer (you cannot put flags after the start of the pathname list). [jc: with fix to a trivial typo noticed by Timo Hirvonen] Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Noticed by Sean. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 26 4月, 2006 7 次提交
-
-
由 Junio C Hamano 提交于
We use get_sha1() for -p (parent) objects, but still used get_sha1_hex() for the tree. Just to be consistent, allow extended SHA1 expression for the tree object name. Note that this is not to encourage funky things like this: git-commit-tree HEAD^{tree} -p HEAD Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
... in the same spirit as 71459c19. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
When we updated ls-tree recursive output to omit the tree nodes, 246cc52f adjusted the old test so that we do not expect to see trees in its output. Later, with 0f8f45cb, we added back the ability to show both with -t option, but we forgot to update the test as well. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
The patch format shows complete rewrite as deletion of all old lines followed by addition of all new lines. Count lines consistenly with that when doing diffstat. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* jc/diff: Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files.
-
由 Junio C Hamano 提交于
Foolishly I renamed diff.o around which caused an old diff.o taken out of libgit.a and got linked into resulting binary and exhibited mysterious breakage for many people. This borrows from the kernel Makefile (scripts/Makefile.build) to first remove the target and then recreate. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 25 4月, 2006 6 次提交
-
-
由 Serge E. Hallyn 提交于
The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com> Signed-off-by: NJunio C Hamano <junkio@cox.net> (cherry picked from 0032d548 commit)
-
由 Petr Baudis 提交于
This has been an unfortunate sideway in the git API evolution. We use git-repo-config for all the other .git/config interaction so let's also use git-repo-config -l for the variable listing. Signed-off-by: NPetr Baudis <pasky@suse.cz>
-
由 Petr Baudis 提交于
This adds git-repo-config --list (or git-repo-config -l) support, similar to what git-var -l does now (to be phased out so that we have a single sane interface to the config file instead of fragmented and confused API). Signed-off-by: NPetr Baudis <pasky@suse.cz>
-
由 Junio C Hamano 提交于
* fix: Document the configuration file Document git-var -l listing also configuration variables rev-parse: better error message for ambiguous arguments
-
由 Petr Baudis 提交于
This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: NPetr Baudis <pasky@suse.cz>
-
由 Petr Baudis 提交于
Signed-off-by: NPetr Baudis <pasky@suse.cz>
-