summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9b8a8f)
raw | patch | inline | side by side (parent: e9b8a8f)
author | Jonas Fonseca <fonseca@diku.dk> | |
Tue, 13 Jan 2009 16:16:58 +0000 (17:16 +0100) | ||
committer | Jonas Fonseca <fonseca@diku.dk> | |
Tue, 13 Jan 2009 21:55:20 +0000 (22:55 +0100) |
No code change.
tig.c | patch | blob | history |
index 457c4037c852e521057c2cc971e26d42d7fbeb89..36c32cd99962ebb92a4075c8503014ec15144190 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -4237,69 +4237,68 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty
add_line_data(view, NULL, type);
- while ((buf = io_get(&io, 0, TRUE))) {
- if (!file) {
- if (!realloc_lines(view, view->line_size + 1))
- goto error_out;
+ while ((buf = io_get(&io, 0, TRUE))) {
+ if (!file) {
+ if (!realloc_lines(view, view->line_size + 1))
+ goto error_out;
- file = calloc(1, sizeof(*file));
- if (!file)
- goto error_out;
+ file = calloc(1, sizeof(*file));
+ if (!file)
+ goto error_out;
- add_line_data(view, file, type);
- }
+ add_line_data(view, file, type);
+ }
- /* Parse diff info part. */
- if (status) {
- file->status = status;
- if (status == 'A')
- string_copy(file->old.rev, NULL_ID);
-
- } else if (!file->status) {
- if (!status_get_diff(file, buf, strlen(buf)))
- goto error_out;
-
- buf = io_get(&io, 0, TRUE);
- if (!buf)
- break;
-
- /* Collapse all 'M'odified entries that
- * follow a associated 'U'nmerged entry.
- */
- if (file->status == 'U') {
- unmerged = file;
-
- } else if (unmerged) {
- int collapse = !strcmp(buf, unmerged->new.name);
-
- unmerged = NULL;
- if (collapse) {
- free(file);
- view->lines--;
- continue;
- }
- }
- }
+ /* Parse diff info part. */
+ if (status) {
+ file->status = status;
+ if (status == 'A')
+ string_copy(file->old.rev, NULL_ID);
+
+ } else if (!file->status) {
+ if (!status_get_diff(file, buf, strlen(buf)))
+ goto error_out;
+
+ buf = io_get(&io, 0, TRUE);
+ if (!buf)
+ break;
- /* Grab the old name for rename/copy. */
- if (!*file->old.name &&
- (file->status == 'R' || file->status == 'C')) {
- string_ncopy(file->old.name, buf, strlen(buf));
+ /* Collapse all 'M'odified entries that follow a
+ * associated 'U'nmerged entry. */
+ if (file->status == 'U') {
+ unmerged = file;
- buf = io_get(&io, 0, TRUE);
- if (!buf)
- break;
+ } else if (unmerged) {
+ int collapse = !strcmp(buf, unmerged->new.name);
+
+ unmerged = NULL;
+ if (collapse) {
+ free(file);
+ view->lines--;
+ continue;
+ }
}
+ }
+
+ /* Grab the old name for rename/copy. */
+ if (!*file->old.name &&
+ (file->status == 'R' || file->status == 'C')) {
+ string_ncopy(file->old.name, buf, strlen(buf));
- /* git-ls-files just delivers a NUL separated
- * list of file names similar to the second half
- * of the git-diff-* output. */
- string_ncopy(file->new.name, buf, strlen(buf));
- if (!*file->old.name)
- string_copy(file->old.name, file->new.name);
- file = NULL;
+ buf = io_get(&io, 0, TRUE);
+ if (!buf)
+ break;
}
+ /* git-ls-files just delivers a NUL separated list of
+ * file names similar to the second half of the
+ * git-diff-* output. */
+ string_ncopy(file->new.name, buf, strlen(buf));
+ if (!*file->old.name)
+ string_copy(file->old.name, file->new.name);
+ file = NULL;
+ }
+
if (io_error(&io)) {
error_out:
done_io(&io);