Skip to contentSkip to conversation

gitweb improvements

DISCUSSION Tjernlund 2 participants 5 messages Jun 15, 2016

lore
Share & tools
lore
#1 lore raw
Quoted 3 lines · Tjernlund

When I browse a repo using gitweb, I miss two things:
1) looking at the history for a file or directory I really want to see the tags there too.

Should be easy to do, but would probably wait (and be indirect result) of refactoring/unification of log-like views code ('log', 'shortlog', 'history', perhaps also 'rss', 'atom', 'search')

I have added it to my gitweb TODO list...

Quoted 4 lines

2) looking at a merge like:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=66120005e65eed8a05b14a36ab448bdec42f0d6b
is somewhat confusing. It really doesn't tell you which commits that is included in the merge.

I don't understand you there. First, you have "(merge: 0d0f3ef 9778e9a)" in the navbar, so you can easily go to commit view for parents. Second, among commit headers you have two "parent", where SHA-1 of a commit is hidden link, and there are also 'commit' and 'diff' link for those.

Signature · 3 lines
Jakub Narebski
Poland
ShadeHawk on #git
author
#2 lore raw
Quoted 15 lines

-----Original Message-----
From: Jakub Narebski [mailto:[email protected]]
Sent: den 5 oktober 2008 19:22
To: Tjernlund
Cc: 'git'
Subject: Re: gitweb improvements

Quoted 3 lines · Tjernlund

When I browse a repo using gitweb, I miss two things:
1) looking at the history for a file or directory I really want to see the tags there too.

Quoted 5 lines

Should be easy to do, but would probably wait (and be indirect result) of refactoring/unification of log-like views code ('log', 'shortlog', 'history', perhaps also 'rss', 'atom', 'search')

I have added it to my gitweb TODO list...

Great! Thanks.

Quoted 11 lines
Quoted 3 lines

2) looking at a merge like:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-

2.6.git;a=commit;h=66120005e65eed8a05b14a36ab448bdec42f0d6b

Quoted 2 lines

is somewhat confusing. It really doesn't tell you which commits that is included in the merge.

I don't understand you there. First, you have "(merge: 0d0f3ef 9778e9a)" in the navbar, so you can easily go to commit view for parents. Second, among commit headers you have two "parent", where SHA-1 of a commit is hidden link, and there are also 'commit' and 'diff' link for those.

hmm, looks like I overlooked "(merge: 0d0f3ef 9778e9a)" part. However, I can't find the "ALSA: make the CS4270 driver a new-style I2C driver" from within this page.

Quoted 5 lines

--
Jakub Narebski
Poland
ShadeHawk on #git

#3 lore raw
Quoted 8 lines · Tjernlund
Quoted 7 lines · Jakub Narebski
Quoted 4 lines · Tjernlund

2) looking at a merge like:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=66120005e65eed8a05b14a36ab448bdec42f0d6b
is somewhat confusing. It really doesn't tell you which commits that is included in the merge.

Quoted 8 lines
Quoted 4 lines

I don't understand you there. First, you have "(merge: 0d0f3ef 9778e9a)" in the navbar, so you can easily go to commit view for parents. Second, among commit headers you have two "parent", where SHA-1 of a commit is hidden link, and there are also 'commit' and 'diff' link for those.

hmm, looks like I overlooked "(merge: 0d0f3ef 9778e9a)" part. However, I can't find the "ALSA: make the CS4270 driver a new-style I2C driver" from within this page.

I think you don't quite understand the situation. The history looks like this:

M Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
|\
| 2 ALSA: ASoC: Fix another cs4270 error path
| * ALSA: make the CS4270 driver a new-style I2C driver
| |
1 | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

Parents of commit 'M' (for merge) are '1' and '2', not 2,* or 1,2,*.

Now the fact that commit message for merge contains shortlog of merged branch does not mean that there must be direct link to such shortlog. You can go to shortlog (well, kind of) if you click on second parent, _then_ click on shortlog link at top of the page.

Signature · 2 lines
Jakub Narebski
Poland
author
#4 lore raw
Quoted 36 lines

-----Original Message-----
From: Jakub Narebski [mailto:[email protected]]
Sent: den 6 oktober 2008 01:54
To: Tjernlund
Cc: 'git'
Subject: Re: gitweb improvements

Quoted 5 lines · Tjernlund
Quoted 4 lines · Jakub Narebski
Quoted 2 lines · Tjernlund

2) looking at a merge like:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-

2.6.git;a=commit;h=66120005e65eed8a05b14a36ab448bdec42f0d6b

Quoted 11 lines
Quoted 7 lines
Quoted 2 lines

is somewhat confusing. It really doesn't tell you which commits that is included in the merge.

I don't understand you there. First, you have "(merge: 0d0f3ef 9778e9a)" in the navbar, so you can easily go to commit view for parents. Second, among commit headers you have two "parent", where SHA-1 of a commit is hidden link, and there are also 'commit' and 'diff' link for those.

hmm, looks like I overlooked "(merge: 0d0f3ef 9778e9a)" part. However, I can't find the "ALSA: make the CS4270 driver a new-style I2C driver" from within this page.

I think you don't quite understand the situation. The history looks like this:

M Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
|\
| 2 ALSA: ASoC: Fix another cs4270 error path
| * ALSA: make the CS4270 driver a new-style I2C driver
| |
1 | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

Quoted 6 lines

Parents of commit 'M' (for merge) are '1' and '2', not 2,* or 1,2,*.

Now the fact that commit message for merge contains shortlog of merged branch does not mean that there must be direct link to such shortlog. You can go to shortlog (well, kind of) if you click on second parent, _then_ click on shortlog link at top of the page.

You are quite right, I didn't quite follow the situation. I do however have one observation, would it be possible to list the commits in a merge the same way you list commits on the top level, that is, more or less make the headings
"ALSA: ASoC: Fix another cs4270 error path"
"ALSA: make the CS4270 driver a new-style I2C driver"
links one can follow?

Jocke