kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Junio C Hamano	7f88c8463c	[PATCH] Make 'git checkout' a bit more forgiving when switching branches. If you make a commit on a path, and then make the path cache-dirty afterwards without changing its contents, 'git checkout' to switch to another branch is prevented because switching the branches done with 'read-tree -m -u $current $next' detects that the path is cache-dirty, but it does not bother noticing that the contents of the path has not been actualy changed. Since switching branches would involve checking out paths different in the two branches, hence it is reasonably expensive operation, we can afford to run update-index before running read-tree to reduce this kind of false change from triggering the check needlessly. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 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>	20 years ago
Junio C Hamano	79882c2883	git-checkout-script: Remove unnecessary variable. There was unused variable $i that counted the number of arguments being processed. Remove it. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
tony.luck@intel.com	ab22707f0a	[PATCH] Fix git-checkout-script exit status Sometimes the git-read-tree in git-checkout-script fails for me. Make sure that the failed status is passed up to caller. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	f6e1a4d6dc	[PATCH] Audit rev-parse users. This patch changes rev-parse users that pass a single argument that is supposed to be a rev parameter to use "--verify". Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Linus Torvalds	91dcdfd3b5	Make "git checkout" create new branches on demand In particular, if we check out something that isn't an old branch, it now requires a new branch-name to check the thing out into. So, for example: git checkout -b my-branch v2.6.12 will create the new branch "my-branch", and start it at v2.6.12, while git checkout master will just switch back to the master branch. Of course, if you want to create a new branch "my-branch" and _not_ check it out, you could have done so with just git-rev-parse v2.6.12^0 > .git/refs/heads/my-branch which I think I will codify as "git branch".	20 years ago
Linus Torvalds	714fff2aa8	Make "git checkout" verify that the argument refers to a commit We still need to create a new branch if it didn't refer to an existing branch, otherwise our HEAD will continue to point to something totally different than what we just checked out. I'll need to think about it. Maybe only do it with "-f" and force it to the "master" branch?	20 years ago
Linus Torvalds	b33e966608	Add "git-sh-setup-script" for common git shell script setup It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script \|\| die "Not a git archive" to make the rest of the git scripts more careful and readable.	20 years ago
Linus Torvalds	e2efb676ef	git-checkout-script: use "--verify --revs-only" to parse revs Sven Verdoolaege points out that I added the --verify option to git-rev-parse exactly for things like this, but didn't update the users.	20 years ago
Linus Torvalds	9661c25640	Fix typo in git-checkout-script. The confusion between "revs" vs "refs" caused us to not find the branch name, which in turn meant that we never switched the HEAD over to it.	20 years ago
Linus Torvalds	ef0bfa25e9	Remove MERGE_HEAD in "git checkout/reset" Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten.	20 years ago
Linus Torvalds	dc14841102	git checkout: fix default head case The "${new=$old}" syntax only works for an undefined 'new', not for an empty one. I knew that. Really. I'm not stupid.	20 years ago
Linus Torvalds	e8b11749f0	Make "git checkout" know about different branches Now "git checkout xyzzy" will check out branch "xyzzy" and switch the HEAD to it.	20 years ago
Linus Torvalds	a79944d76c	"git checkout": add "-u" flag to update HEAD conditionally And fix braino on testing "-f".	20 years ago
Linus Torvalds	303e5f4c32	Add "git checkout" that does what the name suggests It is careful by default and refuses to overwrite old info, but if you want to force everything to be re-read, use the "-f" flag. Some day I'll make it take individual filenames too. Right now it's all-or-nothing.	20 years ago

2 Commits (2aba319a52b3601cff3f32b60bc28023ee45575d)