Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

regression: broken branch graph when calling tig on a specific path #53

Closed
casta opened this issue May 12, 2012 · 2 comments
Closed

regression: broken branch graph when calling tig on a specific path #53

casta opened this issue May 12, 2012 · 2 comments

Comments

@casta
Copy link

casta commented May 12, 2012

Hi,

It seems that in tig 1.0 (and todays git master) that the branch graph is broken when calling tig on a specific path. This was fine with tig 0.18.
I get strange column shifting without any branching or merging involved.

Seen this with 2 different git versions: 1.7.4.1 and 1.7.8.6

For example, I get this output when invoking "tig tig.c" :

  1│ 2012-05-11 16:37 Jonas Fonseca      o [master] [origin/HEAD] [origin/master] Fix opening the pager view from the command prompt
   │ 2012-05-11 08:33 Jonas Fonseca      o Show formatted run request argv when prompting
   │ 2012-05-10 23:40 Vivien Didelot     o Add support to confirm the execution of a binding
   │ 2012-05-11 00:48 Jonas Fonseca      o Change run request to use flags for passing silent and force options
  5│ 2012-05-11 00:22 Jonas Fonseca      o Introduce argv_to_string function in the IO library
   │ 2012-05-11 00:04 Jonas Fonseca      o Simplify add_pager_refs interface to expect the commit ID
   │ 2012-05-11 00:03 Jonas Fonseca      o Use const char pointers for common pager and diff read functions
   │ 2012-05-09 22:42 Jonas Fonseca      │ o [GH #49] Increase the author auto-abbreviation threshold to 10
   │ 2012-05-09 22:24 Jonas Fonseca      │ o [GH #50] Make relative dates show number of years ago for old commits
 10│ 2012-05-09 21:56 Jonas Fonseca      │ o Update the index before showing staged/unstaged changes in the main view
   │ 2012-05-09 21:56 Jonas Fonseca      │ o Do not count the first line and parent accessor lines in the tree view
   │ 2012-05-08 07:23 Jonas Fonseca      │ o Do not count the All branches line in the branch view
   │ 2012-05-08 07:21 Jonas Fonseca      │ o Do not count the unstaged/staged commit lines in the main view
   │ 2012-05-04 18:37 Jonas Fonseca      │ o Fix diff stat for files where the path separator is not shown
 15│ 2012-05-03 16:19 Jonas Fonseca      │ o Use git log format to simplify commit title parsing
   │ 2012-05-03 16:26 Jonas Fonseca      │ o Show the file name of the current position in the diff status
   │ 2012-05-03 09:29 Jonas Fonseca      │ o Show the title of the last commit in the branch view
   │ 2012-04-29 23:46 Jonas Fonseca      │ │ o Enable diff stat navigation for the staged changes views
   │ 2012-04-29 23:07 Jonas Fonseca      │ │ o Fix jumping when the diff stat contains a file with no changes
 20│ 2012-04-29 22:26 Jonas Fonseca      │ │ o Add macro to check if a view line is in range
   │ 2012-04-29 20:41 Jonas Fonseca      │ │ o Do not show empty trees for staged and unstaged commit entries
   │ 2012-04-29 14:33 Jonas Fonseca      │ │ │ o Fix diff stat navigation for unmodified renamed files
   │ 2012-04-25 08:39 Giuseppe Bilotta   │ │ │ │ o prompt_menu: protect against programming error
   │ 2012-04-25 08:36 Giuseppe Bilotta   │ │ │ │ o Suppress clang warning
 25│ 2012-04-25 00:20 Jonas Fonseca      │ │ │ │ │ o Fix compile warnings for an unused variable and return values
   │ 2012-04-24 21:59 Jonas Fonseca      │ │ │ │ │ │ o Fix status view position restoration regression from recent refactorings
   │ 2012-04-22 23:19 Jonas Fonseca      │ │ │ │ │ │ o Move error logic to the respective view open handlers
   │ 2012-04-22 23:15 Jonas Fonseca      │ │ │ │ │ │ o Refactor view loading to allow open methods to abort
   │ 2012-04-22 18:40 Jonas Fonseca      │ │ │ │ │ │ o Move open view error reporting down into the view handlers
 30│ 2012-04-22 18:34 Jonas Fonseca      │ │ │ │ │ │ o Simplify code in status_open
   │ 2012-04-22 17:50 Jonas Fonseca      │ │ │ │ │ │ o Move split_view and maximize_view to the open view section
   │ 2012-04-15 12:12 Jonas Fonseca      │ │ │ │ │ │ o Move refs code to separate file
   │ 2012-04-07 11:25 Jonas Fonseca      │ │ │ │ │ │ o Move keymap to view ops and change to use a struct
   │ 2011-12-03 16:58 Jonas Fonseca      │ │ │ │ │ │ o Rework the help view to not use line->other
 35│ 2011-11-30 23:40 Jonas Fonseca      │ │ │ │ │ │ o Refactor setup of built-in run requests
   │ 2012-04-22 23:14 Jonas Fonseca      │ │ │ │ │ │ o Minor improvement of status view restoration
   │ 2011-12-18 11:46 Jonas Fonseca      │ │ │ │ │ │ o Store all restore information in view.prev_pos
   │ 2011-12-05 07:57 Jonas Fonseca      │ │ │ │ │ │ o Move navigation state to struct position
   │ 2012-04-23 08:26 Jonas Fonseca      │ │ │ │ │ │ o Fix refs reloading by not assuming that they are alphabetically sorted
 40│ 2012-04-19 08:15 Jonas Fonseca      │ │ │ │ │ │ │ o Force load the branch view log data
   │ 2012-04-18 23:57 Jonas Fonseca      │ │ │ │ │ │ │ o Fix default commit order to be that of git-log(1)
   │ 2012-04-18 23:53 Jonas Fonseca      │ │ │ │ │ │ │ o Switch to use git-log(s) default commit ordering
   │ 2012-04-18 03:18 Jonas Fonseca      │ │ │ │ │ │ │ o [GH #23] Add %(prompt) variable
   │ 2012-04-18 02:42 Jonas Fonseca      │ │ │ │ │ │ │ o [GH #30] Enable notes by default

After bisecting, it seems that the culprit comes from this commit:


$ git bisect good
73bee5e48a534ff8ab76346992188f0a229837f9 is the first bad commit
commit 73bee5e48a534ff8ab76346992188f0a229837f9
Author: Jonas Fonseca 
Date:   Thu May 3 16:19:54 2012 -0400

    Use git log format to simplify commit title parsing
    
    Also unifies the git-log(1) command arguments used by the main and
    branch views.

:100644 100644 1430a959bdd2c5676bda0465dbca1378974c5fa7 817926125f7d57952dbffaf0f1f30fccf33e7f5f M      git.h
:100644 100644 e927ca62c5ef923767072f4347bbb96f8e700764 af37bf4a3bf6a28e57398498656137c3233a7779 M      tig.c
jonas added a commit that referenced this issue May 12, 2012
…ified

Thanks to Guillaume Castagnino for reporting and identifying the commit
causing the regression.
@jonas
Copy link
Owner

jonas commented May 12, 2012

Thanks for the detailed bug report. I reverted parts of the commit you identified.

@jonas jonas closed this as completed May 12, 2012
@casta
Copy link
Author

casta commented May 12, 2012

Thanks for the quick fix !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants