kernel/git - git - PowerEL Git System

430 Commits

6 Branches

36 Tags

131 MiB

Tree: 947adb2739

Commit Graph

Author	SHA1	Message	Date
Junio C Hamano	8ac069ac0a	Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Linus Torvalds	d5a72fd622	Fix git-resolve-script. I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.	20 years ago
Linus Torvalds	67cc5c4ef8	Split "git-pull-script" into two parts Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.	20 years ago

Author

SHA1

Message

Date

Junio C Hamano

8ac069ac0a

Introduce GIT_DIR environment variable.

During the mailing list discussion on renaming GIT_ environment
variables, people felt that having one environment that lets the
user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now
GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout
would be handy.  This change introduces GIT_DIR environment
variable, from which the defaults for GIT_INDEX_FILE and
GIT_OBJECT_DIRECTORY are derived.  When GIT_DIR is not defined,
it defaults to ".git".  GIT_INDEX_FILE defaults to
"$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to
"$GIT_DIR/objects".

Special thanks for ideas and discussions go to Petr Baudis and
Daniel Barkalow.  Bugs are mine ;-)

Signed-off-by: Junio C Hamano <junkio@cox.net>

20 years ago

Linus Torvalds

d5a72fd622

Fix git-resolve-script.

I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.

20 years ago

Linus Torvalds

67cc5c4ef8

Split "git-pull-script" into two parts

Separate out the merge resolve from the actual getting of the
data. Also, update the resolve phase to take advantage of the
fact that we don't need to do the commit->tree object lookup
by hand, since all the actors involved happily just act on a
commit object these days.

20 years ago

3 Commits (947adb2739845df3421c0f9647a68acad70c2614)