TODO updates 2006-01-17.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 17, 2006 at 21:42 UTC
b14e2494b8a70737066f4ade4df1b5559e81b44b
3 files changed
+45
-48
Make
+1
-1
@@ -11,7 +11,7 @@ export PATH LANG LC_CTYPE
11
make bindir=$HOME/bin/Linux \
12
gitexecdir=$HOME/bin/Linux \
13
PYTHON_PATH=/usr/bin/python2.4 \
14
- CFLAGS='-O1 -Wall -Wdeclaration-after-statement -g'"$DDD" \
14
+ CFLAGS='-O0 -Wall -Wdeclaration-after-statement -g'"$DDD" \
15
WITH_SEND_EMAIL=YesPlease \
16
WITH_SVNIMPORT=YesPlease \
17
"$@"
PU
+2
-2
@@ -75,7 +75,7 @@ esac
75
76
for H
77
do
78
- (IFS=",$IFS"; git pull -n . $H) || exit
78
+ (IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
79
done
80
81
-(IFS=",$IFS"; git show-branch master pu $* $ORIG_HEAD)
81
+(IFS=",$IFS"; git show-branch master $* pu $ORIG_HEAD)
TODO
+42
-45
@@ -20,13 +20,8 @@ patch, perhaps ;-).
20
Documentation
21
-------------
22
23
-* Talk about using rsync just once at the beginning when
24
- initializing a remote repository so that local packs do not
25
- need to be expanded. I personally do not think we need tool
26
- support for this (but see below about optimized cloning).
27
-
28
-* Maybe update tutorial with a toy project that involves two or
29
- three developers.
23
+* Take the updated tutorial by Bruce Fields very seriously. It
24
+ is a quite good initiative.
25
26
27
Design issues
@@ -36,13 +31,13 @@ Design issues
31
need this; just tell people to run "xxdiff -U" on the working
32
tree files.
33
39
-* Ref namespace management. Perhaps use refs/local/ suggestion
40
- by Linus. [Does not seem to be high on people's priority list,
41
- and not interested myself. People can resurrect this
42
- discussion if they want.]
34
+* Doing a merge in a separate directory.
35
+
36
+* Subprojects. I think the "bind commit" approach has been
37
+ outlined at sufficiently detailed level. Maybe find time to
38
+ actually start prototyping it?
39
44
-* Perhaps "everything in config file"? Especially remotes/
45
- shortcuts. I am modestly negative about this.
40
+ <7vacdzkww3.fsf@assigned-by-dhcp.cox.net>
41
42
43
Technical (heavier)
@@ -75,29 +70,37 @@ Technical (heavier)
70
Technical (milder)
71
------------------
72
78
-* send-pack/receive-pack protocol updates, to allow the receiver
79
- to report what it did to the ref update requests [DONE].
73
+* Decide what to do about rebase applied to merged head. One
74
+ extreme is to allow rebase if "rev-list ours..theirs" gives
75
+ anything. This loosens the current merge-base based approach.
76
+ The other extreme is to refuse rebase if "rev-list
77
+ theirs..ours" contains any merge commit, which was discussed
78
+ on the list.
79
+
80
+ <43CC695E.2020506@codeweavers.com>
81
+
82
+* Decide what the right thing to do upon an empty merge commit,
83
+ when both branches happen to have obtained the same set of
84
+ changes through different history. Not recording such keeps
85
+ the history simpler, and the next merge would soon create a
86
+ true merge commit anyway, but does not feel quite right.
87
+
88
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
89
90
* Perhaps a smarter HTTP anonymous download via CGI.
91
92
* Prepare to enable "always use symbolic refs for HEAD" patch.
84
- We need a timeline to force Porcelains to get ready. Last
85
- time I looked at them I got an impression that gitweb was not
86
- ready.
93
+ We need a timeline to force Porcelains to get ready. All the
94
+ major ones should be ready now.
95
+
96
+* Prepare to enable "most of the things are installed in
97
+ GIT_EXEC_PATH not in bindir". I do not plan to set bindir !=
98
+ gitexecdir myself in the main Makefile I ship, but distos
99
+ should be able to choose to do so.
100
101
* Forbid/ignore pack names that do not conform to the convention
102
sha1_pack_name() assumes and reject in check_packed_git_idx()
90
- [In pu]
91
-
92
-* strip leading directory from ls-tree output, to match ls-files
93
- output.
94
-
95
- I am of two minds about this one. diff output must always be
96
- -p1 format no matter where the command was started, and
97
- ls-tree might be easier to use if it matched diff, not
98
- ls-files.
99
-
100
- [DONE, with --full-name option like ls-files]
103
+ [In "pu"]
104
105
* Any Porcelain-ish we forgot or punted to make usable from
106
subdirectory? I think the last pass caught everything and
@@ -110,11 +113,18 @@ Technical (milder)
113
114
* daemon --strict-symlink.
115
116
+* daemon --no-user-dir, to make ~user still work with
117
+ --base-path. They ought to be independent.
118
+
119
+* daemon --base-path does not apply automatically to whitelist
120
+ somehow feels wrong. If somebody cares enough, accept
121
+ patches.
122
+
123
* Perhaps detect cloning request in upload-pack and cache the
124
result for next cloning request until any of our refs change.
125
126
* Perhaps accept patch to optionally allow '--fuzz' in
117
- 'git-apply'.
127
+ 'git-apply'. am/applymbox is _not_ the place to do it.
128
129
* Allow 'git apply' to accept GNU diff 2.7 output that forgets
130
to say '\No newline' if both input ends with incomplete
@@ -129,28 +139,15 @@ Technical (milder)
139
just the basename, and see the improved clustering results in
140
better packing [Tried, but did not work out well].
141
132
-* Daemon --base-path does not apply automatically to whitelist
133
- somehow feels wrong. If somebody cares enough, accept
134
- patches.
135
-
142
143
Technical (trivial)
144
-------------------
145
140
-* Daemon --base-path forbidding user-path automatically feels
141
- wrong. If somebody cares enough, accept patches.
146
+* s/naked/bare/g.
147
148
* git-proxy should be spawned with sh -c 'command' $1 $2.
149
145
-* Versioning scheme. The next maintenance installment will be
146
- 1.0.3 not 1.0.0c. The next feature release would be 1.1.0 [DONE].
147
-
148
-* Either drop supporting Debian myself or coerce patches out of
149
- the official maintainer [DONE -- DROPPED].
150
-
151
-* We would want test scripts for the relative directory path
152
- stuff Linus has been working on. Most of the C-level
153
- commands should be usable with relative directory paths.
150
+* test scripts for the relative directory path stuff.
151
152
* In a freshly created empty repository, `git fetch foo:bar`
153
works OK, but `git checkout bar` afterwards does not (missing