kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Fredrik Kuivinen	d025524d9d	Usage message clean-up, take #2 There were some problems with the usage message clean-up patch series. I hadn't realised that subdirectory aware scripts can't source git-sh-setup. I propose that we change this and let the scripts which are subdirectory aware set a variable, SUBDIRECTORY_OK, before they source git-sh-setup. The scripts will also set USAGE and possibly LONG_USAGE before they source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE. If we go this way it's easy to catch --help in git-sh-setup, print the (long) usage message to stdout and exit cleanly. git-sh-setup can define a 'usage' shell function which can be called by the scripts to print the short usage string to stderr and exit non-cleanly. It will also be easy to change $0 to basename $0 or something else, if would like to do that sometime in the future. What follows is a patch to convert a couple of the commands to this style. If it's ok with everyone to do it this way I will convert the rest of the scripts too. [jc: thrown in to proposed updates queue for comments.] Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jason Riedy	9754563ca9	Use printf rather than echo -n. On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting literal so whoever changes the literal ought to notice more easily so they are safe.] Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	ae2b0f1518	git-sh-setup: die if outside git repository. Now all the users of this script detect its exit status and die, complaining that it is outside git repository. So move the code that dies from all callers to git-sh-setup script. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	f179044862	git-status: do not mark unmerged paths as committable. An unmerged path appears as both "Updated but not checked in" list, and "Changed but not updated" list. We are not going to commit that path until it is resolved, so remove it from the former list. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	38cc7ab814	Clarify git status output. What we list as "Ignored files" are not "ignored". Rather, it is the list of "not listed in the to-be-ignored files, but exists -- you may be forgetting to add them". Pointed out by Daniel. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	71ac8356d8	Update git-status to new git-diff-* and git-ls-files output. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Johannes Schindelin	d52920e397	Teach git-status about spaces in file names also on MacOSX Not all sed understands '\t' and consequently cuts off every file name at the first "t" (or backslash...). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Kai Ruemmler	33bb218e9d	teach git-status about spaces in filenames git-status truncates filenames up to the first occurrence of a whitespace character when displaying. More precisely, it displays the filename up to any field seperator defined in $IFS. This patch fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Linus Torvalds	5d1a5c02e8	[PATCH] Better error reporting for "git status" Instead of "git status" ignoring (and hiding) potential errors from the "git-update-index" call, make it exit if it fails, and show the error. In order to do this, use the "-q" flag (to ignore not-up-to-date files) and add a new "--unmerged" flag that allows unmerged entries in the index without any errors. This also avoids marking the index "changed" if an entry isn't actually modified, and makes sure that we exit with an understandable error message if the index is corrupt or unreadable. "read_cache()" no longer returns an error for the caller to check. Finally, make die() and usage() exit with recognizable error codes, if we ever want to check the failure reason in scripts. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	8098a178b2	Add git-symbolic-ref This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <junio@twinsun.com>	19 years ago
Junio C Hamano	215a7ad1ef	Big tool rename. As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	86b13da46c	scripts: equality test '==' is not portable. On NetBSD 3 we trigger an error: [: ==: unexpected operator Double-equal is accepted by bash built-in '[' and bash(1) suggests using '=' for strict POSIX compliance (test(1) from coreutils does not mention '=='). Eradicate their uses everywhere. [jc: Somebody with a pseudonym kindly sent a message to let me know about the problem privately; I do not have access to a NetBSD box.] Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	7e011c40bc	Fix git-status when HEAD is invalid. It tried to do git-diff-cache against HEAD, of course. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	ba966b9579	Teach git-status-script about git-ls-files --others When there is non-empty $GIT_DIR/info/exclude file, use it along with .gitignore per-directory exclude pattern files (which was a convention agreed on the list while ago and is compatible with Cogito) to generate a list of ignored files as well. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)	19 years ago
Junio C Hamano	9804b7dc19	Show the branch name more prominently in "git status". When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	3998f8eba9	Show which branch you are on in git-status output. When not on the "master" branch, show which branch we are working on in the git-status message. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Ryan Anderson	b55db7ba28	[PATCH] git-status-script was missed during the conversion from N -> A git-status-script was missed during the conversion from "N" to "A" as the new-file marker flag. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Linus Torvalds	753fd78458	Use "-M" instead of "-C" for "git diff" and "git status" The "C" in "-C" may stand for "Cool", but it's also pretty slow, since right now it leaves all unmodified files to be tested even if there are no new files at all. That just ends up being unacceptably slow for big projects, especially if it's not all in the cache.	20 years ago
Junio C Hamano	2036d84102	[PATCH] Buglets fix in the new two scripts Should be obvious... - Use $VISUAL, $EDITOR, in this order if set, and fall back on vi. - Status R, C, D, N usually are followed by number, so adjust case arms to that pattern. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	a3e870f2e2	Add "commit" helper script This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating.	20 years ago

11 Commits (1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0)