@matheusbsbs / matheus-bagliano / commits / f8ab671134
Fork 0

snapshot 2006-04-14

Junio C Hamano committed Apr 14, 2006 at 13:54 UTC f8ab671134121663f27a75f64e941a40d2a3bff1
4 files changed +57 -78
Doit
+1 -1
@@ -8,7 +8,7 @@ test -z "$(git diff --cached --name-status)" || {
8 }
9 Meta/Make clean >/dev/null 2>&1
10
11 -branches='next master maint'
11 +: ${branches='next master pu'}
12
13 nstall=install
14 for branch in $branches
RB new
+42
@@ -0,0 +1,42 @@
1 +#!/bin/sh
2 +
3 +master_sha1=`git rev-parse --verify refs/heads/master`
4 +LF='
5 +'
6 +(cd .git/refs/heads && find -type f) |
7 +sed -n \
8 + -e 's/^\.\///' \
9 + -e '/^[^\/][^\/]\//p' |
10 +while read topic
11 +do
12 + rebase= done= not_done= trouble= date=
13 + topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
14 +
15 + date=`
16 + git-rev-list -1 --pretty "$topic" |
17 + sed -ne 's/^Date: *\(.*\)/ (\1)/p'
18 + `
19 + only_next_1=`git-rev-list ^master "^$topic" next | sort`
20 + only_next_2=`git-rev-list ^master next | sort`
21 + rebase=
22 + if test "$only_next_1" = "$only_next_2"
23 + then
24 + not_in_topic=`git-rev-list "^$topic" master`
25 + if test -z "$not_in_topic"
26 + then
27 + :; # already up-to-date.
28 + else
29 + rebase=" (can be rebased)"
30 + fi
31 + fi
32 + if test -n "$rebase"
33 + then
34 + echo "Rebasing $topic to pick up:"
35 + git-rev-list --pretty=oneline "^$topic" master |
36 + sed -e 's/^[0-9a-f]* / * /'
37 + git checkout "$topic" &&
38 + git rebase master || break;
39 + fi
40 +done
41 +
42 +
TODO
+6 -72
@@ -17,45 +17,23 @@ if ever -- only if somebody cares enough and submits a clean
17 patch, perhaps ;-).
18
19
20 -Documentation
21 --------------
22 -
23 -* No pending issues at the moment. "Revamp Tutorial" initiative
24 - by Bruce Fields ongoing and things are looking better.
25 -
26 -
20 UI
21 --
22
23 * Make "git branch -d foo" while on foo branch suggest "maybe
24 you want to go back to 'master'?"
25
33 -* Error message from "git checkout -b bar v2.6.10" should assume
34 - v2.6.10 is an attempt to switch to a new branch based on
35 - mistyped tag, not an attempt to revert path v2.6.10 from the
36 - HEAD commit with extra "make and switch to this branch"
37 - argument.
38 -
39 -* "git commit [-i|-o] paths..." with misspelled paths would be
40 - silently ignored. Add a flag to ls-files to catch unmatched
41 - pathspec to prevent this.
42 -
26
27 Design issues
28 -------------
29
47 -* Rehash "git commit" with various parameters to be more
48 - intuitive without breaking traditinal users too much. We need
49 - to phase this in, especially if we are going to change "git
50 - commit" to imply the current "git commit -a" behaviour.
51 -
52 -* "intent to add" index entries.
30 +* "intent to add" index entries?
31
32 * Plug-in file-level merges. On the other hand, we may not even
33 need this; just tell people to run "xxdiff -U" on the working
34 tree files.
35
58 -* Doing a merge in a separate directory.
36 +* Doing a merge in a separate directory?
37
38 * Make 'format-patch' take revision limiters similar to
39 rev-list. For example:
@@ -101,17 +79,14 @@ Technical (heavier)
79
80 This needs a matching smart on the dumb protocol downloader.
81
104 -* Maybe an Emacs VC backend.
105 -
106 -* Look at libified GNU diff CVS seems to use, or libxdiff.
107 - [Daniel has his own diff tool almost ready to start
108 - integrating and testing]
109 -
82
83 Technical (milder)
84 ------------------
85
114 -* "git status -v" to give commit preview.
86 +* Shallow clones.
87 +
88 +* Encourage competition between annotate vs blame. Maybe come
89 + up with some nontrivial test cases.
90
91 * Subprojects. I think the "bind commit" approach has been
92 outlined at sufficiently detailed level. Maybe find time to
@@ -119,34 +94,6 @@ Technical (milder)
94
95 <7vacdzkww3.fsf@assigned-by-dhcp.cox.net>
96
122 -* Shallow clones.
123 -
124 -* Mark entries as "assume unchanged" in the index.
125 -
126 - <Pine.LNX.4.64.0601311807470.7301@g5.osdl.org>
127 -
128 - A config item '[core] trust_stat = false' would cause to:
129 -
130 - - "update-index" with or without --add would mark the path
131 - valid after registering. Should we make the working tree
132 - file read-only at this point?
133 -
134 - - checkout-index -u would mark the path and makes the working
135 - tree file read-only.
136 -
137 - - read-tree without -u would mark the path invalid.
138 -
139 - - update-index --refresh should *not* mark up-to-date paths valid.
140 -
141 - Impacts to various commands:
142 -
143 - - update-index --refresh would ignore them.
144 -
145 - - diff-files would say unchanged.
146 -
147 - - diff-index without --cached acts the same way as diff-index
148 - --cached.
149 -
97 * Decide what to do about rebase applied to merged head. One
98 extreme is to allow rebase if "rev-list ours..theirs" gives
99 anything. This loosens the current merge-base based approach.
@@ -164,8 +111,6 @@ Technical (milder)
111
112 <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
113
167 -* Perhaps a smarter HTTP anonymous download via CGI.
168 -
114 * diff stopping at the first output; qgit wants to know if this
115 tree has any A or D from the other tree and nothing else.
116 Would help internal tree-diff in rev-list as well.
@@ -179,22 +124,11 @@ Technical (milder)
124 * Perhaps detect cloning request in upload-pack and cache the
125 result for next cloning request until any of our refs change.
126
182 -* Perhaps accept patch to optionally allow '--fuzz' in
183 - 'git-apply'. am/applymbox is _not_ the place to do it.
184 -
185 -* Allow 'git apply' to accept GNU diff 2.7 output that forgets
186 - to say '\No newline' if both input ends with incomplete
187 - lines.
188 -
127 * Perhaps deal with "Files differ" (binary diff) in non C
128 locales.
129
130 * Maybe grok PGP signed text/plain in applymbox as well.
131
194 -* Output full path in the "git-rev-list --objects" output, not
195 - just the basename, and see the improved clustering results in
196 - better packing [Tried, but did not work out well].
197 -
132
133 Technical (trivial)
134 -------------------
WI
+8 -5
@@ -1,11 +1,14 @@
1 #!/bin/sh
2 # Prepare "What's in git.git"
3
4 +master_at=$(git rev-parse --verify refs/heads/master)
5 +
6 echo "To: git@vger.kernel.org"
7 echo "Subject: What's in git.git"
8 +echo "X-master-at: $master_at"
9
10 tagged=`git rev-parse --not --verify tags/sa/master`
8 -list=`git-rev-list $tagged heads/master 2>/dev/null`
11 +list=`git-rev-list $tagged refs/heads/master 2>/dev/null`
12 if test -n "$list"
13 then
14 echo
@@ -14,22 +17,22 @@ then
17 git log $tagged heads/master | git shortlog
18 fi
19
17 -list=`git-rev-list heads/master..heads/next 2>/dev/null`
20 +list=`git-rev-list refs/heads/master..refs/heads/next 2>/dev/null`
21 if test -n "$list"
22 then
23 echo
24 echo
25 echo "* The 'next' branch, in addition, has these."
26 echo
24 - git log --no-merges heads/master..heads/next | git shortlog
27 + git log --no-merges refs/heads/master..refs/heads/next | git shortlog
28 fi
29
27 -list=`git-rev-list ^heads/master ^heads/next heads/pu 2>/dev/null`
30 +list=`git-rev-list ^refs/heads/master ^refs/heads/next refs/heads/pu 2>/dev/null`
31 if test -n "$list"
32 then
33 echo
34 echo
35 echo "* The 'pu' branch, in addition, has these."
36 echo
34 - git log --no-merges ^heads/master ^heads/next heads/pu | git shortlog
37 + git log --no-merges ^refs/heads/master ^refs/heads/next refs/heads/pu | git shortlog
38 fi